diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua index 3a04785de9..7eb52405da 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua @@ -390,7 +390,9 @@ function this.SetScrollPre(root,data) local pos=this.GetPos()--位置 local oldPower = HeroManager.GetSingleHeroData(curHeroData.dynamicId).warPower UIManager.OpenPanel(UIName.GodPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function() - PopupTipPanel.ShowTip(Language[11526]) + if curHeroData.dynamicId then + PopupTipPanel.ShowTip(Language[11526]) + end this.RefreshShow() --对比战力并更新战力值 播放战力变更动画 HeroManager.CompareWarPower1(curHeroData.dynamicId,oldPower) @@ -491,7 +493,10 @@ function this.GetCurHeroSoulPrintState(id) for k=1,#curHeroData.godPrintList do local _id=curHeroData.godPrintList[k].equipId - if equipConfig[_id].SuiteID==equipConfig[id].SuiteID then + -- if equipConfig[_id].SuiteID==equipConfig[id].SuiteID then + -- return true + -- end + if equipConfig[_id].Id==equipConfig[id].Id then return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua index 9c0495f924..a5403a5fd6 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua @@ -93,7 +93,10 @@ function GodPrintPopUp:BindEvent() end) --提升品阶 Util.AddClick(self.upStarBtn, function() - UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GodPrintUp,soulId,pos,heroId,callback) + if curType~=2 then + heroId=nil + end + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GodPrintUp,soulId,pos,heroId,nil) self:ClosePanel() end) --穿戴 @@ -103,6 +106,7 @@ function GodPrintPopUp:BindEvent() if curHeroData and curHeroData.godPrintList and #curHeroData.godPrintList > 0 then for i = 1, #curHeroData.godPrintList do if curHeroData.godPrintList[i].equipId == soulId then + LogError("11111111111") PopupTipPanel.ShowTip(Language[11524]) return end