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

Merge branch 'dev_20230815' into battle

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

battle_base_controller.lua.meta

pvp战斗概念引入

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

battle_controller_arena.lua

木棍边缘障碍物

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

battle_controller_arena.lua.meta

pvp战斗和整合pve战斗

2023-06-28 21:24:15 +08:00

battle_controller_daily_challenge.lua

木棍边缘障碍物

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

battle_controller_daily_challenge.lua.meta

每日战斗战斗部分

2023-05-26 15:42:35 +08:00

battle_controller_dungeon_armor.lua

支线副本

2023-07-20 17:41:42 +08:00

battle_controller_dungeon_armor.lua.meta

支线副本

2023-07-20 17:41:42 +08:00

battle_controller_dungeon_gold.lua

pvp战斗和整合pve战斗

2023-06-28 21:24:15 +08:00

battle_controller_dungeon_gold.lua.meta

暂存

2023-06-12 15:21:26 +08:00

battle_controller_dungeon_shards.lua

pvp战斗和整合pve战斗

2023-06-28 21:24:15 +08:00

battle_controller_dungeon_shards.lua.meta

金币副本

2023-06-12 16:46:55 +08:00

battle_controller_dungeon_weapon.lua

装备副本

2023-07-19 20:16:17 +08:00

battle_controller_dungeon_weapon.lua.meta

装备副本

2023-07-19 20:16:17 +08:00

battle_controller_pvp.lua

bug修复

2023-07-06 18:43:02 +08:00

battle_controller_pvp.lua.meta

pvp战斗概念引入

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

battle_controller_stage.lua

木棍边缘障碍物

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

battle_controller_stage.lua.meta

棋盘

2023-04-07 11:24:27 +08:00

battle_controller.lua

pvp战斗和整合pve战斗

2023-06-28 21:24:15 +08:00

battle_controller.lua.meta

棋盘

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