xiekaidong 14dfdecddc Merge branch 'battle' into dev ...

# Conflicts:
#	lua/app/config/strings/cn/global.lua

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

..

localization_global_const.lua

Merge branch 'battle' into dev

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

localization_global_const.lua.meta

整理代码

2023-04-03 10:59:13 +08:00