diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua index 290dcbee18..5e4c8f5ee1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua @@ -91,7 +91,7 @@ function FaLingSingleShowPopup:BindEvent() end) Util.AddClick(self.btnStrong, function() - UIManager.OpenPanel(UIName.FaLingStrongPopup,self.equipData,self) + UIManager.OpenPanel(UIName.FaLingStrongPopup,self.equipData,self,self.curHeroData) end) Util.AddClick(self.btnAdd, function() NetManager.BaublesWearRequest(self.curHeroData.dynamicId,self.equipData.did,nil,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua index adebaa13d4..1459e6c9d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua @@ -111,11 +111,12 @@ function FaLingStrongPopup:OnSortingOrderChange() end local openPanel=nil --界面打开时调用(用于子类重写) -function FaLingStrongPopup:OnOpen(_equipData,_openPanel) +function FaLingStrongPopup:OnOpen(_equipData,_openPanel,_herodata) if not _equipData then return end --父界面 openPanel=_openPanel + self.curHeroData=_herodata self.equipData = _equipData --当前装备数据 --0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换)、5自己或其他人穿戴(非装备界面但需要显示套装属性) --self.func = _func