From 681b3b63bb591dadb66bc4e2fae13a64a73dedcb Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 1 Jun 2021 20:02:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=AF=8F=E6=97=A5=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E3=80=91=E7=89=B9=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 3 +++ .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 3 +++ .../~Lua/Modules/DynamicActivity/LingShowTeHui.lua | 3 +++ .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 3 +++ .../~Lua/Modules/DynamicActivity/SheJiDaDian.lua | 3 +++ .../~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua | 3 +++ .../~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua | 3 +++ .../~Lua/Modules/DynamicActivity/TimeLimitedCall.lua | 3 +++ .../~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua | 3 +++ .../~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua | 3 +++ .../~Lua/Modules/DynamicActivity/YiJingBaoKu.lua | 3 +++ .../~Lua/Modules/NewActivity/CommonActPage.lua | 3 +++ .../~Lua/Modules/NewActivity/ConRechargePage.lua | 3 +++ .../~Lua/Modules/NewActivity/ExChangePage.lua | 3 +++ .../ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua | 3 +++ .../~Lua/Modules/Operating/CumulativeSignInPage.lua | 3 +++ .../~Lua/Modules/Operating/GrowthGiftPage.lua | 3 +++ .../~Lua/Modules/Operating/MonthCardPage.lua | 3 +++ .../~Lua/Modules/Operating/UppperMonthCard.lua | 3 +++ .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 5 +++++ .../~Lua/Modules/Recharge/View/RechargeView.lua | 3 +++ Assets/ManagedResources/~Lua/View/ShopViewNew.lua | 3 ++- 22 files changed, 67 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 2abd404216..55107e1a9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -145,6 +145,9 @@ end function this:OnSortingOrderChange() orginLayer = self.sortingOrder + for k,v in pairs(subViewList) do + v.sub:OnSortingOrderChange(self.sortingOrder) + end end ----==========================一级页签相关=========================================== -- tab按钮自定义显示设置 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index fe1448fafa..ab34aa03cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -90,6 +90,9 @@ function LingShouBaoGe:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function LingShouBaoGe:OnSortingOrderChange() +end + function LingShouBaoGe:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua index e948a5db9c..a5502cfaf7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua @@ -54,6 +54,9 @@ function LingShowTeHui:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function LingShowTeHui:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function LingShowTeHui:OnShow(_sortingOrder,_parent) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index ddff2dc202..4a733188e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -85,6 +85,9 @@ function QianKunBox:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function QianKunBox:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function QianKunBox:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua index 1db7f3eb71..aeed2a1818 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua @@ -182,6 +182,9 @@ function SheJiDaDian:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function SheJiDaDian:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function SheJiDaDian:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index b4c43f8b0f..c71d96fe8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -66,6 +66,9 @@ function ShengYiTianJiang:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function ShengYiTianJiang:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function ShengYiTianJiang:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 67da1ba79f..0f943f571a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -120,6 +120,9 @@ function TimeLimitUpHero:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function TimeLimitUpHero:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function TimeLimitUpHero:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 97315603bc..b8d3980e68 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -90,6 +90,9 @@ function TimeLimitedCall:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function TimeLimitedCall:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function TimeLimitedCall:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index 8f0ea20255..35744e559e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -82,6 +82,9 @@ function XiangYaoDuoBao:BindEvent() end) end +function XiangYaoDuoBao:OnSortingOrderChange() +end + function XiangYaoDuoBao:OnShow(_sortingOrder,_parent) local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao) if not actId or actId <= 0 then return end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua index 66d8637cc6..d98da95fd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua @@ -111,6 +111,9 @@ function XinJiangLaiXi:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function XinJiangLaiXi:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function XinJiangLaiXi:OnShow(_sortingOrder,_parent) local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinJiangLaiXi) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index 735f2905e9..f00716a114 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -83,6 +83,9 @@ function YiJingBaoKu:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function YiJingBaoKu:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function YiJingBaoKu:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 38e9f0091d..3c6bf0c98d 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -61,6 +61,9 @@ function CommonActPage:OnOpen(_activityConfig,_index,parent) PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..self.actConfig.ActiveType,1) end +function CommonActPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function CommonActPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua index 0c1e57ac67..13f80a623c 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua @@ -64,6 +64,9 @@ function ConRechargePage:OnOpen(_activityConfig,_index,parent) self.gameObject.name = "ConRechargePage"..self.actConfig.Id end +function ConRechargePage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function ConRechargePage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua index 57119e7b43..d1856df21d 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua @@ -71,6 +71,9 @@ function ExChangePage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function ExChangePage:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function ExChangePage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua index 104232c6c1..1ec3d6c48c 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -59,6 +59,9 @@ function ExpertPage:OnOpen(_activityConfig,_index,parent) self.gameObject.name = "ExpertPage"..self.actConfig.Id end +function ExpertPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function ExpertPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua index 2385d79fb1..54b95b8a95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -94,6 +94,9 @@ function CumulativeSignInPage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function CumulativeSignInPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function CumulativeSignInPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index 67b4de281a..08cdf13dd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -67,6 +67,9 @@ function GrowthGiftPage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function GrowthGiftPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function GrowthGiftPage:OnShow(_sortingOrder) VipManager.SetGrowthPackagePointStatus()--成长礼包 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 238d560350..34221b4090 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -81,6 +81,9 @@ function MonthCardPage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function MonthCardPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function MonthCardPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index b83714a2ab..0d605ff232 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -109,6 +109,9 @@ function UpperMonthCard:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function UpperMonthCard:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function UpperMonthCard:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 393431c339..7787db6ef7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -93,6 +93,11 @@ function EveryDayGift:OnOpen(_activityConfig,_index,parent) self.gameObject.name = "EveryDayGift"..self.actConfig.Id end +function EveryDayGift:OnSortingOrderChange(_sortingOrder) + Util.SetParticleSortLayer(self.UI_Effect_jinkuang_Yuan, _sortingOrder+1) + self.sortingOrder = _sortingOrder +end + -- 打开,重新打开时回调 function EveryDayGift:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua index c6e4de4e0a..f51c944de0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua @@ -57,6 +57,9 @@ function RechargeView:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function RechargeView:OnSortingOrderChange() +end + function RechargeView:OnShow(_sortingOrder) self.gameObject:SetActive(true) self.sortingOrder = _sortingOrder diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 297bdd11d1..c96d312c6c 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -127,7 +127,8 @@ function ShopViewNew:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Shop.RefreshItem,RefreshData,self) end - +function ShopViewNew:OnSortingOrderChange() +end --界面打开时调用(用于子类重写) function ShopViewNew:OnOpen(_activityConfig,_index,parent)