ee97ab1c93
# Conflicts: # Assets/lua/app/config/item.lua.bytes # Assets/lua/app/config/localization/localization_global_const.lua.bytes # Assets/lua/app/config/skill.lua.bytes # Assets/lua/app/config/strings/cn/global.lua.bytes # Assets/lua/app/config/strings/cn/item.lua.bytes # Assets/lua/app/config/strings/de/item.lua.bytes # Assets/lua/app/config/strings/en/global.lua.bytes # Assets/lua/app/config/strings/en/item.lua.bytes # Assets/lua/app/config/strings/fr/item.lua.bytes # Assets/lua/app/config/strings/id/item.lua.bytes # Assets/lua/app/config/strings/ja/item.lua.bytes # Assets/lua/app/config/strings/ko/item.lua.bytes # Assets/lua/app/config/strings/pt/item.lua.bytes # Assets/lua/app/config/strings/ru/item.lua.bytes # Assets/lua/app/config/strings/th/item.lua.bytes # Assets/lua/app/config/strings/vi/item.lua.bytes # Assets/lua/app/config/strings/zh/global.lua.bytes # Assets/lua/app/config/strings/zh/item.lua.bytes # Assets/lua/app/module/battle/battle_const.lua.bytes # Assets/lua/app/module/battle/controller/battle_controller.lua.bytes # Assets/lua/app/ui/battle/battle_ui.lua.bytes # Assets/lua/app/ui/main_city/main_city_ui.lua.bytes