From edcd105a6854086048a18b077bbe26d5b5c68185 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 13 Aug 2021 10:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E6=9C=AA=E8=8E=B7=E5=BE=97=E7=9A=84=E7=81=B5=E5=85=BD?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E8=AF=A6=E7=BB=86=E6=9F=A5=E7=9C=8B=E5=92=8C=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua index 1a6ee2985f..cdb455f15a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua @@ -20,6 +20,7 @@ function PokemonGetInfoPopup:InitComponent() proList[i] = Util.GetGameObject(self.transform,"bg/PokemonInfo/pro/singlePro ("..i..")") end + this.skillLvGo=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage") this.skillName=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/nameText"):GetComponent("Text") this.skillLv=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage/skillLv"):GetComponent("Text") this.skillIcon=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/icon"):GetComponent("Image") @@ -69,7 +70,6 @@ function this.GetShowPanelData() PokemonManager.SetHeroStars(this.spLoader, this.starGrid, pokemonBackData.star,2,Vector2.New(60,60)) --属性 local allAddProVal=PokemonManager.GetSinglePokemonAddProDataByLvAndStar(pokemonBackData.tempId,pokemonBackData.level,pokemonBackData.star) - proList[0]:SetActive(true) Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453] Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = pokemonBackData.level Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05") @@ -96,6 +96,7 @@ function this.GetShowPanelData() end local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId) this.skillName.text = GetLanguageStrById(curSkillConFig.Name) + this.skillLvGo:SetActive(true) this.skillLv.text = curSkillConFig.Level this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon)) Util.AddOnceClick(this.skillBtn, function() @@ -111,7 +112,9 @@ function this.NoGetShowPanelData() PokemonManager.SetHeroStars(this.spLoader, this.starGrid, 0,2,Vector2.New(60,60)) --属性 local allAddProVal = PokemonManager.GetSinglePokemonAddProDataBySid(pokemonSid) --this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star) - proList[0]:SetActive(false) + Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453] + Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = "1/"..pokemonSData.MaxLevel + Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05") local index = 0 for key, value in pairs(allAddProVal) do index = index + 1 @@ -135,10 +138,12 @@ function this.NoGetShowPanelData() end local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId) this.skillName.text = GetLanguageStrById(curSkillConFig.Name) - this.skillLv.text = curSkillConFig.Level + this.skillLvGo:SetActive(false) + -- this.skillLv.text = curSkillConFig.Level this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon)) Util.AddOnceClick(this.skillBtn, function() - UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonSid,1,0) + -- UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonSid,1,0) + UIManager.OpenPanel(UIName.PokemonAllSkillInfoPopup,pokemonSid,1,0) end) end