diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index 1b3e2657f2..939c198082 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -228,7 +228,7 @@ function RoleGetInfoPopup:OnShow() local maxLv= HeroManager.GetHeroSkillMaxLevel(heroSData.Id,skillData.skillConfig.Type) local nextData local panel - if skillList2 then + if skillList2 and skillList2[i] and i>2 then nextData=skillList2[i] --飞升技能 if i==6 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index ce81caf231..1513b97edb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -542,7 +542,11 @@ function this.SoulPrintInfo() end function this.SkillInfo() - local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,curHeroData.star) + local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,curHeroData.heroConfig.MaxRank, curHeroData.star) + local skillList2 + if curHeroData.heroConfig.MaxRank>9 then + skillList2 = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,10,curHeroData.star) + end for i = 1, this.skillGrid.transform.childCount do this.skillGrid.transform:GetChild(i-1).gameObject:SetActive(false) end @@ -569,7 +573,20 @@ function this.SkillInfo() skillData.isOpen=skillList[i].isOpen skillData.needStar=skillList[i].needStar local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,skillData.skillConfig.Type) - local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i) + --local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i) + if skillList2 and skillList2[i] and i>2 then + nextData=skillList2[i] + nextData.isOpen=skillList2[i].isOpen + nextData.needStar=skillList2[i].needStar + --飞升技能 + if i==6 then + panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i) + else + panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData) + end + else + panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i) + end this.skillGrid:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1 triggerCallBack = function (panelType, p) if panelType == UIName.SkillInfoPopup and panel == p then --监听到SkillInfoPopup关闭,把层级设回去