From 764f61cfb24aa8880de0f6efe42a9360f4a45e18 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 31 Mar 2022 14:29:25 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=3D=3D=3D=3D=3D=E9=A3=9E=E5=8D=87=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=8B=B1=E9=9B=84=E4=B8=B4=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Hero/PropCondition.lua | 7 ++++++- .../~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropCondition.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropCondition.lua index 7680516b30..9ac39bacdb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/PropCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropCondition.lua @@ -30,7 +30,12 @@ Condition_Prop_Func = { -- 判断元素是否符合条件 --LogError("zhenyingid=="..target.zhenYingId) -- LogError("target.did=="..target.dId) - local heroData=HeroManager.GetSingleHeroData(target.dId) + local heroId=target.dId + local isTrue=HeroTempPropManager.IsTempHeroID(heroId) + if isTrue then + heroId=HeroTempPropManager.GetDynamicIdByTempId(heroId) + end + local heroData=HeroManager.GetSingleHeroData(heroId) if config and args and heroData.changeProId == tonumber(args[1]) then return propList end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index d4b330ec91..4cdbe97582 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -90,13 +90,11 @@ function this:OnShow(_parent,_args) end function this:Refresh(_page) curPage = _page - LogError("page==".._page) this.light.transform:SetParent(this.btnList[_page].transform) this.light.transform.localPosition = Vector3.zero local heroDatas={} for i = 1, #heros do - LogError(tostring(heros[i])) local CONFIG = heros[i][2] == 6 and itemConfig or heroConfig if CONFIG[heros[i][1]] then if not heroDatas[heros[i][2]] then