diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 7f6e647f11..914b16a02b 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2278,4 +2278,5 @@ [12277] = "未查询到符合条件的装备!", [12278] = "%d天%02d时", [12279] = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力", + [12280] = "该神将在巅峰赛阵容中已上阵", } diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index 8f74d30f60..9a5c5f108a 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -590,7 +590,7 @@ end -- 通过总轮数获取当前阶段名称 function this.GetTurnNameByRoundTimes(roundTimes,curTurn) - LogGreen("roundTimes "..roundTimes) + -- LogGreen("roundTimes "..roundTimes) if not roundTimes or roundTimes <= 0 then return Language[10122] end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua index f0390515c3..8e12b746f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua @@ -115,7 +115,8 @@ function this:FormationAdapter(msg) demon:SetActive(true) local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon)) - Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).Star)) + local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId) + Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality,heroConFig.Star)) Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName SetHeroStars(starGrid, curData.hero.star) proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName)) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 07c0104dbb..11777bce3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -343,7 +343,7 @@ function this.GetHeroFormationStr(teamId) return Language[11108] -- 1001 elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then - return Language[11101] + return Language[12280] end end return "" @@ -367,7 +367,7 @@ function this.GetHeroFormationStr2(teamId) elseif teamId == FormationTypeDef.EXPEDITION then return Language[10699], FormationTypeDef.EXPEDITION elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then - return Language[11110], FormationTypeDef.ARENA_TOM_MATCH + return Language[12280], FormationTypeDef.ARENA_TOM_MATCH end end return "" diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 8f9b8feab3..a87c1efef6 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2277,3 +2277,4 @@ 12277,δѯװ 12278,%d%02dʱ 12279,ϵ񽫶50%˺\nϵ񽫽50% +12280,۷ diff --git a/data_execl/base_data/SpecialConfig.xlsx b/data_execl/base_data/SpecialConfig.xlsx index dac208fc6a..27357a9f40 100644 Binary files a/data_execl/base_data/SpecialConfig.xlsx and b/data_execl/base_data/SpecialConfig.xlsx differ