From 03d181336899bd2b5aa662dcf74ba16bbbf2d2a6 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 4 Jul 2024 19:02:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E6=8A=80=E8=83=BD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/FaLingSingleShowPopup.lua | 2 +- .../ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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