diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 3da831f0f0..7b9760b28b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -280,22 +280,20 @@ function RoleInfoPanel:BindEvent() end) --法宝 Util.AddClick(this.talismanClick,function() - if curHeroData.baublesId==nil or curHeroData.baublesId=="" then - local list=FaLingManager.GetAllEquipDataNoBless() - local curSelectList={} - UIManager.OpenPanel(UIName.FaLingListPanel,list,this,curSelectList,curHeroData,1) - else - LogError("curHeroData.baublesId==="..curHeroData.baublesId) - local data=FaLingManager.GetEquipDataByDid(curHeroData.baublesId) - UIManager.OpenPanel(UIName.FaLingSingleShowPopup,this,data,2,false,false,curHeroData) - end + if talismanIsOpen then - --UIManager.OpenPanel(UIName.RoleTalismanPanelV2,curHeroData,heroDatas) - -- - + if curHeroData.baublesId==nil or curHeroData.baublesId=="" then + local list=FaLingManager.GetAllEquipDataNoBless() + local curSelectList={} + UIManager.OpenPanel(UIName.FaLingListPanel,list,this,curSelectList,curHeroData,1) + else + LogError("curHeroData.baublesId==="..curHeroData.baublesId) + local data=FaLingManager.GetEquipDataByDid(curHeroData.baublesId) + UIManager.OpenPanel(UIName.FaLingSingleShowPopup,this,data,2,false,false,curHeroData) + end else - --PopupTipPanel.ShowTip(TalismanManager.GetCurHeroIsOpenTalismanTip()) + PopupTipPanel.ShowTip(TalismanManager.GetCurHeroIsOpenTalismanTip()) end end) --查看法宝特性按钮 @@ -818,7 +816,7 @@ function this:UpdateHeroInfoData() --法宝按钮逻辑 this.talismanBtn.gameObject:SetActive(TalismanManager.CheckTalismanIsInConfig(curHeroData)) - this.talismanBtn.gameObject:SetActive(true) + --this.talismanBtn.gameObject:SetActive(true) if TalismanManager.CheckTalismanIsInConfig(curHeroData) then talismanIsOpen = TalismanManager.GetCurHeroIsOpenTalisman(curHeroData) this.talismanInfo.gameObject:SetActive(not talismanIsOpen) diff --git a/Assets/ManagedResources/~Lua/View/RoleItemView.lua b/Assets/ManagedResources/~Lua/View/RoleItemView.lua index ad6f983e2c..5e774a0fcc 100644 --- a/Assets/ManagedResources/~Lua/View/RoleItemView.lua +++ b/Assets/ManagedResources/~Lua/View/RoleItemView.lua @@ -71,7 +71,7 @@ function RoleItemView:OnShowHeroData(effectLayer) starSize = Vector2.New(60,57) end SetHeroBg(this.spLoader, Util.GetGameObject(self.gameObject, "iconMask"),self.frame,star,self.heroData.heroConfig.Quality) - self.icon.sprite = this.spLoader:LoadSprite(self.heroData.heroConfig.ShowLive) + self.icon.sprite = this.spLoader:LoadSprite(GetResourcePath(self.heroData.heroConfig.ShowLive)) --SetHEeroLiveToward(self.icon.gameObject,self.heroData.heroConfig.Toward ) self.lv.text=self.heroData.lv -- self.pos.sprite=this.spLoader:LoadSprite(self.heroData.professionIcon)