From dc50f89214eca16f83a3f267c72b697e202f88e8 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 26 Mar 2021 13:49:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2?= =?UTF-8?q?=E5=A4=A9=E3=80=91upview=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 4a3edbb3cd..23211018dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -66,7 +66,9 @@ end --界面打开时调用(用于子类重写) function NiuQiChongTian:OnOpen() - self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft}) + if not self.UpView then + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.NiuQiChongTian }) + end end -- 打开,重新打开时回调 @@ -75,7 +77,6 @@ function NiuQiChongTian:OnShow() local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuQi) if not actId or actId <= 0 then return end self.gameObject:SetActive(true) - self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.NiuQiChongTian }) self.TabCtrl = TabBox.New() self.TabCtrl:SetTabAdapter(this.TabAdapter) @@ -213,7 +214,7 @@ end --界面销毁时调用(用于子类重写) function NiuQiChongTian:OnDestroy() - SubUIManager.Close(this.UpView) + SubUIManager.Close(self.UpView) sortingOrder = 0 end From b7cff350f9bc0897a2feecf009256f7c6f725f0b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 26 Mar 2021 13:56:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2?= =?UTF-8?q?=E5=A4=A9=E3=80=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 23211018dd..d2c5649ced 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -30,7 +30,7 @@ local BtnState ={ function NiuQiChongTian:InitComponent() self.backBtn = Util.GetGameObject(self.gameObject,"backBtn") self.tabBox = Util.GetGameObject(self.gameObject, "TabBox") - self.upView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft}) + self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft}) --进度条 self.progress = Util.GetGameObject(self.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount From dc187723c869d89bb8f7a7d153b09a58457a7706 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 26 Mar 2021 14:00:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2?= =?UTF-8?q?=E5=A4=A9=E3=80=91upview=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5d33070a00ca7b5c337522e0eb1b94cac304391e) --- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index d2c5649ced..7a7b001e26 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -66,9 +66,7 @@ end --界面打开时调用(用于子类重写) function NiuQiChongTian:OnOpen() - if not self.UpView then - self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.NiuQiChongTian }) - end + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.NiuQiChongTian }) end -- 打开,重新打开时回调 @@ -206,6 +204,7 @@ end --界面关闭时调用(用于子类重写) function NiuQiChongTian:OnClose() + SubUIManager.Close(self.UpView) for key, value in pairs(redPointList) do ClearRedPointObject(key, value) end @@ -214,7 +213,6 @@ end --界面销毁时调用(用于子类重写) function NiuQiChongTian:OnDestroy() - SubUIManager.Close(self.UpView) sortingOrder = 0 end From ad3b3c3e45fc79d9491a4286ead7e3f908fec1f1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 26 Mar 2021 14:05:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2?= =?UTF-8?q?=E4=B8=8D=E5=8A=A8=E4=BA=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 7a7b001e26..50333d56a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -204,7 +204,6 @@ end --界面关闭时调用(用于子类重写) function NiuQiChongTian:OnClose() - SubUIManager.Close(self.UpView) for key, value in pairs(redPointList) do ClearRedPointObject(key, value) end @@ -213,6 +212,7 @@ end --界面销毁时调用(用于子类重写) function NiuQiChongTian:OnDestroy() + SubUIManager.Close(self.UpView) sortingOrder = 0 end