d311ea14aa
# Conflicts: # lua/app/config/avatar_frame.lua # lua/app/config/chapter_board.lua # lua/app/config/grid_type.lua # lua/app/config/strings/cn/avatar.lua # lua/app/config/strings/cn/avatar_frame.lua # lua/app/config/strings/en/avatar.lua # lua/app/config/strings/en/avatar_frame.lua # lua/app/config/strings/en/item.lua # lua/app/config/strings/es/avatar.lua # lua/app/config/strings/es/avatar_frame.lua # lua/app/config/strings/es/item.lua # lua/app/config/strings/id/avatar.lua # lua/app/config/strings/id/avatar_frame.lua # lua/app/config/strings/id/item.lua # lua/app/config/strings/ja/avatar.lua # lua/app/config/strings/ja/avatar_frame.lua # lua/app/config/strings/ja/item.lua # lua/app/config/strings/ko/avatar.lua # lua/app/config/strings/ko/avatar_frame.lua # lua/app/config/strings/ko/item.lua # lua/app/config/strings/pt/avatar.lua # lua/app/config/strings/pt/avatar_frame.lua # lua/app/config/strings/pt/item.lua # lua/app/config/strings/th/avatar.lua # lua/app/config/strings/th/avatar_frame.lua # lua/app/config/strings/th/item.lua # lua/app/config/strings/vi/avatar.lua # lua/app/config/strings/vi/avatar_frame.lua # lua/app/config/strings/vi/item.lua # lua/app/config/strings/zh/avatar.lua # lua/app/config/strings/zh/avatar_frame.lua # lua/app/config/strings/zh/item.lua # lua/app/config/summon.lua # lua/app/module/battle/component/battle_unit_comp.lua # lua/app/module/battle/team/battle_team.lua