Fang 3880dfd3d2 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge ...

# Conflicts:
#	lua/app/common/module_manager.lua
#	lua/app/config/buff_daily_challenge.lua
#	lua/app/config/chapter.lua
#	lua/app/config/hero.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua

2023-05-29 18:24:33 +08:00

..

battle_team.lua

Merge remote-tracking branch 'origin/dev' into fang/daily_challenge

2023-05-29 18:24:33 +08:00

battle_team.lua.meta

battle team

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