puxuan
4aa2e6f2a7
Merge branch 'dev_hero' into dev_act
# Conflicts:
# Assets/lua/app/config/buff.lua.bytes
# Assets/lua/app/config/fx.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/strings/cn/attr.lua.bytes
# Assets/lua/app/config/strings/cn/task_type.lua.bytes
# Assets/lua/app/config/strings/de/attr.lua.bytes
# Assets/lua/app/config/strings/en/attr.lua.bytes
# Assets/lua/app/config/strings/en/task_type.lua.bytes
# Assets/lua/app/config/strings/es/attr.lua.bytes
# Assets/lua/app/config/strings/es/task_type.lua.bytes
# Assets/lua/app/config/strings/fr/attr.lua.bytes
# Assets/lua/app/config/strings/id/attr.lua.bytes
# Assets/lua/app/config/strings/id/task_type.lua.bytes
# Assets/lua/app/config/strings/ja/attr.lua.bytes
# Assets/lua/app/config/strings/ja/task_type.lua.bytes
# Assets/lua/app/config/strings/ko/attr.lua.bytes
# Assets/lua/app/config/strings/ko/task_type.lua.bytes
# Assets/lua/app/config/strings/pt/attr.lua.bytes
# Assets/lua/app/config/strings/pt/task_type.lua.bytes
# Assets/lua/app/config/strings/ru/attr.lua.bytes
# Assets/lua/app/config/strings/th/attr.lua.bytes
# Assets/lua/app/config/strings/th/task_type.lua.bytes
# Assets/lua/app/config/strings/vi/attr.lua.bytes
# Assets/lua/app/config/strings/vi/task_type.lua.bytes
# Assets/lua/app/config/strings/zh/attr.lua.bytes
# Assets/lua/app/config/strings/zh/task_type.lua.bytes
2025-10-07 18:30:51 +08:00
..
2025-10-07 18:30:51 +08:00
2025-09-12 15:28:08 +08:00
2025-08-04 18:49:43 +08:00
2025-10-07 18:30:51 +08:00
2023-10-27 14:24:31 +08:00
2025-10-07 18:30:51 +08:00
2025-10-07 17:19:46 +08:00
2025-04-30 23:12:28 +08:00
2025-09-12 16:30:28 +08:00
2025-05-06 20:44:39 +08:00
2025-09-02 20:49:34 +08:00