From d1970ed6ccdfcb753a3f8736041bb8204fcc764a Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 19 May 2022 22:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=96=E4=BA=BA=E8=8B=B1=E9=9B=84=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 2 ++ .../ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index f38d8879bd..6504d11601 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -426,7 +426,7 @@ function HandBookRoleInfoLayout:SkillInfo() -- end local maxLv= HeroManager.GetHeroSkillMaxLevel(heroConFigData.Id,skillData.skillConfig.Type) --local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i,nextData) - if skillList2 and skillList2[i] then + if skillList2 and skillList2[i] and i>2 then nextData=skillList2[i] nextData.isOpen=skillList2[i].isOpen nextData.needStar=skillList2[i].needStar diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 350898a8c1..ce81caf231 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -566,6 +566,8 @@ function this.SkillInfo() this.selsectSkillImage.transform.position=Util.GetGameObject(go.transform,"Icon").transform.position local skillData = {} skillData.skillConfig = skillList[i].skillConfig + 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) this.skillGrid:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 11a8228cc3..3ecfc2bc42 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -402,7 +402,7 @@ function this.SkillInfo() -- nextData=skillList2[i] -- end local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,skillData.skillConfig.Type) - if skillList2 and skillList2[i] then + if skillList2 and skillList2[i] and i>2 then nextData=skillList2[i] nextData.isOpen=skillList2[i].isOpen nextData.needStar=skillList2[i].needStar