From 2a87d43fd091a719676dfdb3d132fc71084096c5 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 31 Jul 2020 17:36:06 +0800 Subject: [PATCH] bug --- .../ManagedResources/~Lua/Common/Language.lua | 1 + .../ArenaTopMatch/ArenaTopMatchManager.lua | 2 +- .../View/ExpeditionMonsterInfo_Recruit.lua | 3 ++- .../~Lua/Modules/Hero/HeroManager.lua | 4 ++-- data_execl/Language_data/LanguageLua.csv | 1 + data_execl/base_data/SpecialConfig.xlsx | Bin 13284 -> 13186 bytes 6 files changed, 7 insertions(+), 4 deletions(-) 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 dac208fc6a10ee2ebbf7d41f121d4ba0fcd68536..27357a9f40058b8acb45595cddd88c1985ded0c3 100644 GIT binary patch delta 11508 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 literal 13284 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 Sf1C?|1?m9|yzoqa{QG|t^m0=G