From 95b7fceb34e58755f36dcb6442cff58aa3a8cfaf Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 8 Nov 2021 14:02:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A5=9E=E9=AD=82]=3D=3D=3D=3D=3D=3D=E7=A5=9E?= =?UTF-8?q?=E9=AD=82=E5=8D=87=E7=BA=A7=E5=90=8E=E6=8A=80=E8=83=BD=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 4 +++- .../ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 82d6bb753a..56e88e2e66 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1709,7 +1709,9 @@ function GetCurrSkillConfigDesc(cfg,soulLv) local ss = {} local skillValue=cfg.DescValue if cfg.SpiritsValue and soulLv and soulLv>0 then - skillValue=cfg.SpiritsValue[soulLv] + if cfg.SpiritsValue[soulLv] then + skillValue=cfg.SpiritsValue[soulLv] + end end for i=1, #cfg.DescColor do local str diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 7d5d43ae29..ef879129cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -126,6 +126,9 @@ function RoleInfoPopup:BindEvent() this:SetSkillSelectImage(this.skill1.transform, true) local star,starType = curHeroData.GetStar(1) + if starType~=3 then--非神魂 + star=nil + end local maxLv = HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id, allSkillDatas[1].skillConfig.Type) local panel = UIManager.OpenPanel(UIName.SkillInfoPopup, allSkillDatas[1], 4, 10, maxLv, 1,nil,star) --this.skillGrid:GetComponent("Canvas").overrideSorting=true @@ -151,6 +154,9 @@ function RoleInfoPopup:BindEvent() Log("===============22222 "..allSkillDatas[2].skillConfig.Type) local star,starType = curHeroData.GetStar(1) + if starType~=3 then--非神魂 + star=nil + end local maxLv = HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id, allSkillDatas[2].skillConfig.Type) local panel = UIManager.OpenPanel(UIName.SkillInfoPopup, allSkillDatas[2], 4, 10, maxLv, 2,nil,star) --this.skillGrid:GetComponent("Canvas").overrideSorting=true