xiekaidong 42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815 ...

# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua

2023-08-08 15:58:56 +08:00

..

cell

Merge branch 'dev_20230809' into dev_20230815

2023-08-08 15:58:56 +08:00

battle_arena_pause_ui.lua

竞技场暂停界面可滑动

2023-07-07 11:43:53 +08:00

battle_arena_pause_ui.lua.meta

竞技场暂停界面

2023-07-04 15:03:37 +08:00

battle_armor_result_ui.lua

界面调整

2023-07-21 16:15:25 +08:00

battle_armor_result_ui.lua.meta

支线副本

2023-07-20 21:46:49 +08:00

battle_base_ui.lua

Merge branch 'dev_20230809' into dev_20230815

2023-08-08 15:58:56 +08:00

battle_base_ui.lua.meta

pvp战斗概念引入

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

battle_box_open_ui.lua

副本开启引导触发

2023-06-15 15:32:27 +08:00

battle_box_open_ui.lua.meta

弹窗

2023-05-22 10:24:45 +08:00

battle_daily_challenge_buff_ui.lua

切换波次时自动关闭buff弹窗

2023-06-06 14:12:50 +08:00

battle_daily_challenge_buff_ui.lua.meta

每日挑战战斗内部界面

2023-05-26 15:43:01 +08:00

battle_pause_ui.lua

pvp战斗和整合pve战斗

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

battle_pause_ui.lua.meta

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

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

battle_result_ui.lua

显示fix

2023-07-24 21:39:18 +08:00

battle_result_ui.lua.meta

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

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

battle_skill_select_comp.lua

pvp战斗和整合pve战斗

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

battle_skill_select_comp.lua.meta

技能选择界面改到战斗界面中

2023-04-25 23:27:19 +08:00

battle_ui_pvp.lua

木棍边缘障碍物

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

battle_ui_pvp.lua.meta

pvp战斗概念引入

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

battle_ui.lua

木棍边缘障碍物

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

battle_ui.lua.meta

棋盘

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

cell.meta

棋盘

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