xiekaidong 26862b0e02 Merge branch 'dev_20230815' into battle ...

# Conflicts:
#	lua/app/config/buff.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/es/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/helper/battle_buff_handle.lua

2023-08-08 16:02:24 +08:00

..

battle_hero_comp.lua

波次之间回血

2023-04-20 20:53:26 +08:00

battle_hero_comp.lua.meta

修复一些报错

2023-04-11 20:33:13 +08:00

battle_monster_comp.lua

波次之间回血

2023-04-20 20:53:26 +08:00

battle_monster_comp.lua.meta

战斗

2023-04-12 21:14:10 +08:00

battle_number_comp.lua

连携提示

2023-06-14 18:20:57 +08:00

battle_number_comp.lua.meta

冒伤害

2023-04-13 22:04:22 +08:00

battle_unit_comp.lua

Merge branch 'dev_20230815' into battle

2023-08-08 16:02:24 +08:00

battle_unit_comp.lua.meta

战斗

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