xiekaidong ce97be9b65 Merge branch 'dev' into arena ...

# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/module/battle/controller/battle_controller.lua
#	lua/app/ui/main_city/main_city_ui.lua

2023-07-04 15:36:04 +08:00

..

chapter_manager.lua

Merge branch 'dev' into arena

2023-07-04 15:36:04 +08:00

chapter_manager.lua.meta

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

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