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_select_skill_cell.lua

显示优化

2023-04-24 14:16:19 +08:00

battle_select_skill_cell.lua.meta

一些肉鸽技能

2023-04-11 17:26:02 +08:00

grid_cell.lua

显示调整

2023-08-07 17:21:45 +08:00

grid_cell.lua.meta

棋盘

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

grid_edge_cell.lua

木棍边缘障碍物

2023-08-02 18:07:44 +08:00

grid_edge_cell.lua.meta

木棍边缘障碍物

2023-08-02 18:07:44 +08:00

select_skill_cell.lua

rogue技能显示修改

2023-04-20 15:17:14 +08:00

select_skill_cell.lua.meta

战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理

2023-04-14 15:18:14 +08:00

skill_node_cell.lua

技能tips

2023-05-22 15:59:17 +08:00

skill_node_cell.lua.meta

一些界面修改和接入关卡结算

2023-04-14 22:19:22 +08:00

tiny_buff_cell.lua

回合数优化

2023-08-01 17:38:53 +08:00

tiny_buff_cell.lua.meta

pvp战斗概念引入

2023-06-26 15:28:40 +08:00

unit_result_report_cell.lua

伤害统计

2023-04-21 22:41:32 +08:00

unit_result_report_cell.lua.meta

战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理

2023-04-14 15:18:14 +08:00