aacf7bc803
# Conflicts: # lua/app/config/buff.lua.meta # lua/app/config/chapter.lua # lua/app/config/chapter.lua.meta # lua/app/config/hero.lua.meta # lua/app/config/hero_level.lua # lua/app/config/hero_level.lua.meta # lua/app/config/skill_hero.lua # lua/app/config/skill_hero.lua.meta # lua/app/config/strings/cn/chapter.lua.meta # lua/app/config/strings/cn/hero.lua.meta # lua/app/config/strings/cn/skill_hero.lua.meta # lua/app/config/strings/de/chapter.lua.meta # lua/app/config/strings/de/hero.lua.meta # lua/app/config/strings/de/skill_hero.lua.meta # lua/app/config/strings/en/chapter.lua.meta # lua/app/config/strings/en/hero.lua.meta # lua/app/config/strings/en/skill_hero.lua.meta # lua/app/config/strings/fr/chapter.lua.meta # lua/app/config/strings/fr/hero.lua.meta # lua/app/config/strings/fr/skill_hero.lua.meta # lua/app/config/strings/id/chapter.lua.meta # lua/app/config/strings/id/hero.lua.meta # lua/app/config/strings/id/skill_hero.lua.meta # lua/app/config/strings/ja/chapter.lua.meta # lua/app/config/strings/ja/hero.lua.meta # lua/app/config/strings/ja/skill_hero.lua.meta # lua/app/config/strings/ko/chapter.lua.meta # lua/app/config/strings/ko/hero.lua.meta # lua/app/config/strings/ko/skill_hero.lua.meta # lua/app/config/strings/pt/chapter.lua.meta # lua/app/config/strings/pt/hero.lua.meta # lua/app/config/strings/pt/skill_hero.lua.meta # lua/app/config/strings/ru/chapter.lua.meta # lua/app/config/strings/ru/hero.lua.meta # lua/app/config/strings/ru/skill_hero.lua.meta # lua/app/config/strings/th/chapter.lua.meta # lua/app/config/strings/th/hero.lua.meta # lua/app/config/strings/th/skill_hero.lua.meta # lua/app/config/strings/vi/chapter.lua.meta # lua/app/config/strings/vi/hero.lua.meta # lua/app/config/strings/vi/skill_hero.lua.meta # lua/app/config/strings/zh/chapter.lua.meta # lua/app/config/strings/zh/hero.lua.meta # lua/app/config/strings/zh/skill_hero.lua.meta