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
..
2023-08-01 17:35:58 +08:00
2023-04-10 17:03:34 +08:00
2023-08-02 18:07:44 +08:00
2023-05-16 19:13:08 +08:00
2023-08-08 15:58:17 +08:00
2023-04-11 17:26:02 +08:00