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

..

app

Merge branch 'dev_20230815' into battle

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

app.meta

整理代码

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

main.lua

整理代码

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

main.lua.meta

整理代码

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