From e5494e65abc2cc97d0158f65de0500b0fcf7595b Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 21 Jan 2022 13:55:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A3=9E=E5=8D=87]=3D=3D=3D=3D=3D=E5=9B=BE?= =?UTF-8?q?=E9=89=B4=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/functions.lua | 11 ++++++----- .../Modules/HandBook/HandBookHeroInfoPanel.lua | 16 +++++++++------- .../Modules/HandBook/HandBookRoleInfoLayout.lua | 10 +++++----- .../Modules/Practice/PracticeImprintPanel.lua | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index c16ea004de..0d4482850f 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -431,6 +431,11 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList) --img:GetComponent("RectTransform").sizeDelta = Vector2.New(116,50) img.transform.localScale = Vector3.one*_scale img.transform.localPosition = Vector3.New(0,71*_scale+y,0) + if imgFloor then + img.transform:SetSiblingIndex(imgFloor) + else + img.transform:SetSiblingIndex(3) + end else if _star>11 then img.gameObject:SetActive(true) @@ -439,11 +444,7 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList) end end - if imgFloor then - img.transform:SetSiblingIndex(imgFloor) - else - img.transform:SetSiblingIndex(3) - end + img=img:GetComponent("Image") diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 1cb1a2268a..22e7a31b34 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -138,7 +138,7 @@ function HandBookHeroInfoPanel:OnOpen(...) heroStar=temp[5] end _CurPageIndex = RoleInfoPanelIndex.qingbao - heroDatas = PlayerManager.heroHandBookListData[heroConFigData.Natural] + heroDatas = PlayerManager.heroHandBookListData[_curStar] for i = 1, #heroDatas do if heroConFigData.Id == heroDatas[i].Id then index = i @@ -193,7 +193,6 @@ end --刷新左右两边的英雄星级和index function HandBookHeroInfoPanel:UpdateLiveList() local starIndex = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.RoleAwake) and 11 or 10 - LogError("star==".._curStar) if index - 1 > 0 then _leftStar = _curStar leftIndex = index - 1 @@ -252,8 +251,8 @@ function this:UpdateHeroInfoData() this.heroName.text = GetLanguageStrById(heroConFigData.ReadingName) this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(heroConFigData.PropertyName)) --定位描述相关 - LogError("heroConFigData.natural=="..heroConFigData.Natural) - self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroConFigData.Natural)) + --self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroConFigData.Natural)) + self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(_curStar)) self.pizhiImg:SetNativeSize() if _CurPageIndex == RoleInfoPanelIndex.pifu then local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id) @@ -305,13 +304,12 @@ function this:UpdateHeroInfoData() self.talentBtn:SetActive(false) local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh" self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage) - local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules + local OpenPassiveSkillRules = heroStar >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId) self.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum end Util.AddOnceClick(self.talentBtn,function() - LogError("breakid=="..breakId.." upStarId=="..upStarId) if heroStar==11 then UIManager.OpenPanel(UIName.RoleAwakeTalentPopup,heroConFigData) else @@ -397,7 +395,11 @@ function HandBookHeroInfoPanel:OnPageTabChange(index) this.PageList[index] = SubUIManager.Open(tabs[index].sub,self.layout.transform) end this.PageList[index]:OnShow() - this.PageList[index]:SetData(this.sortingOrder,self,heroConFigData,heroConFigData.MaxRank,_curLv) + local showStar=heroConFigData.MaxRank + if _curStar==6 then + showStar=11 + end + this.PageList[index]:SetData(this.sortingOrder,self,heroConFigData,showStar,_curLv) end function HandBookHeroInfoPanel:ChangeCurentHeroSkinLive(herodata) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index 1fbda6629d..701e9a9be9 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -106,16 +106,13 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv) lv=1 end end - --计算面板属性 allAddProVal=self:CalculateHeroAllProValList(_starType,star,lv) self.atkPro.text=allAddProVal[HeroProType.Attack] self.hpPro.text=allAddProVal[HeroProType.Hp] self.phyDef.text=allAddProVal[HeroProType.PhysicalDefence] self.magDef.text=allAddProVal[HeroProType.MagicDefence] - self.lvTxt.text= " "..lv - LogError("star=="..star.." lv=="..lv) self.posTxt.text=star >= HeroManager.awakeNextStarIndex and GetLanguageStrById(heroConFigData.HeroLocationDesc4) or GetLanguageStrById(heroConFigData.HeroLocationDesc1) self.proImg.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroConFigData.Profession)) self.proTxt.text=GetLanguageStrById(heroConFigData.HeroLocation) @@ -156,7 +153,11 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv) Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image"):SetNativeSize() local OpenPassiveSkillRules = star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId) - Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum + if star==11 then + Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..10 + else + Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum + end Util.AddOnceClick(allBtns[len+1],function() UIManager.ClosePanel(currPanelName) @@ -304,7 +305,6 @@ function HandBookRoleInfoLayout:CalculateHeroAllProValList(_starType,_starNum,cu for i, v in ConfigPairs(propertyConfig) do allAddProVal[i] = 0 end - breakId = 0 upStarId = 0 if _starType == 2 then diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 54647656c1..7263f1b8f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -258,7 +258,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData) proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local star,starType = heroData.GetStar(1) SetHeroStars(self.spLoader,starGrid, star,starType) - SetHeroFlyEffect(self.Hero,self.spLoader,heroData.star,self.sortingOrder+1,1,2,0) + SetHeroFlyEffect(Util.GetGameObject(self.head, "GameObject"),self.spLoader,heroData.star,self.sortingOrder+1,1,3,0) Util.SetParticleSortLayer(starGrid,self.sortingOrder + 1) curhero = _serverData.subId else