From d443fe2233a0cb9416f5f200e7907fb029e952f5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 15 Jan 2021 15:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1007787=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=BF=83=E9=AD=94=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E9=98=B6=E6=AE=B5=E5=A5=96=E5=8A=B1=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B1=82?= =?UTF-8?q?=E6=95=B0=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/TrialRewardPopup.lua | 4 ++- .../~Lua/View/ScrollCycleView.lua | 31 ++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 5c847369cf..98b9c875bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -39,6 +39,7 @@ function TrialRewardPopup:OnOpen(...) local arg = {...} rewardConfig = arg[1] getFunc = arg[2] + curType = arg[3] end function TrialRewardPopup:OnShow() @@ -55,7 +56,8 @@ function TrialRewardPopup:OnShow() end function TrialRewardPopup:OnClose() - GameObject.DestroyImmediate(scrollView.gameObject) + --GameObject.DestroyImmediate(scrollView.gameObject) + SubUIManager.Close(scrollView) itemList = {} end diff --git a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua index d3014a3a8f..3b560cfea6 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua @@ -160,6 +160,7 @@ local function OnMoveEnd(self) end end + function ScrollCycleView:New(gameObject) local b = {} b.gameObject = gameObject @@ -170,11 +171,23 @@ end --初始化组件(用于子类重写) function ScrollCycleView:InitComponent() - self.trigger = Util.GetEventTriggerListener(self.gameObject) - self.trigger.onBeginDrag = self.trigger.onBeginDrag + function (p,d) OnBeginDrag(self,p,d) end - self.trigger.onDrag = self.trigger.onDrag + function (p,d) OnDrag(self,p,d) end - self.trigger.onEndDrag = self.trigger.onEndDrag + function (p,d) OnEndDrag(self,p,d) end + --界面关闭时调用(用于子类重写) + self.OnBeginDragNew = function(p,d) + OnBeginDrag(self,p,d) + end + --界面关闭时调用(用于子类重写) + self.OnDragNew= function(p,d) + OnDrag(self,p,d) + end + --界面关闭时调用(用于子类重写) + self.OnEndDragNew= function(p,d) + OnEndDrag(self,p,d) + end + self.trigger = Util.GetEventTriggerListener(self.gameObject) + self.trigger.onBeginDrag = self.trigger.onBeginDrag + self.OnBeginDragNew + self.trigger.onDrag = self.trigger.onDrag + self.OnDragNew + self.trigger.onEndDrag = self.trigger.onEndDrag + self.OnEndDragNew self.rectTransform = self.gameObject:GetComponent("RectTransform") self.dragGO = Util.GetGameObject(self.gameObject, "grid") self.dragGOTran = self.dragGO:GetComponent("RectTransform") @@ -189,6 +202,7 @@ function ScrollCycleView:InitComponent() self.elastic = true --支持超框拖动 end + --绑定事件(用于子类重写) function ScrollCycleView:BindEvent() end @@ -203,8 +217,17 @@ end --界面关闭时调用(用于子类重写) function ScrollCycleView:OnClose() + self.trigger.onBeginDrag = self.trigger.onBeginDrag - self.OnBeginDragNew + self.trigger.onDrag = self.trigger.onDrag - self.OnDragNew + self.trigger.onEndDrag = self.trigger.onEndDrag - self.OnEndDragNew + Util.ClearChild(self.dragGOTran.transform) + self.cellItemList = {} + self.goItemList = {} + self.goItemDataRefList = {} + self.dataList = {} end + --界面销毁时调用(用于子类重写) function ScrollCycleView:OnDestroy() end