puxuan d83268f66e Merge branch 'dev_hero' into dev_act ...

# Conflicts:
#	lua/app/config/fx.lua
#	lua/app/config/strings/cn/attr.lua
#	lua/app/config/strings/de/attr.lua
#	lua/app/config/strings/en/attr.lua
#	lua/app/config/strings/es/attr.lua
#	lua/app/config/strings/fr/attr.lua
#	lua/app/config/strings/id/attr.lua
#	lua/app/config/strings/ja/attr.lua
#	lua/app/config/strings/ko/attr.lua
#	lua/app/config/strings/pt/attr.lua
#	lua/app/config/strings/ru/attr.lua
#	lua/app/config/strings/th/attr.lua
#	lua/app/config/strings/vi/attr.lua
#	lua/app/config/strings/zh/attr.lua

2025-10-07 18:31:30 +08:00

..

component

新增肉鸽类型

2025-09-19 14:49:12 +08:00

controller

每日挑战

2025-10-07 18:27:59 +08:00

helper

判定修复

2023-09-08 10:37:10 +08:00

skill

新增肉鸽类型

2025-09-19 14:49:12 +08:00

team

fix bug

2025-09-08 11:45:19 +08:00

battle_const.lua

敌方属性计算

2025-09-23 19:55:35 +08:00

battle_const.lua.meta

棋盘

2023-04-06 10:38:04 +08:00

battle_manager.lua

主界面图标

2025-09-28 16:09:37 +08:00

battle_manager.lua.meta

棋盘

2023-04-06 10:38:04 +08:00

component.meta

战斗

2023-04-10 17:09:00 +08:00

controller.meta

棋盘

2023-04-06 10:38:04 +08:00

helper.meta

战斗

2023-04-11 18:23:25 +08:00

skill.meta

技能生成规则

2023-04-10 17:03:34 +08:00

team.meta

battle team

2023-04-17 00:09:48 +08:00