From e8dd8f9bea9de07fa0bb3be9342e3ee3f5697878 Mon Sep 17 00:00:00 2001 From: JieLing Date: Sun, 11 Apr 2021 01:37:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=BB=E5=8A=A8=E3=80=91=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=9A=84=E6=B4=BB=E5=8A=A8=E9=A1=B5=E7=AD=BE?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 3 +++ .../Modules/DynamicActivity/DynamicActivityManager.lua | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 971528e090..cfeeda7254 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -62,6 +62,9 @@ end -- 打开,重新打开时回调 function ActivityMainPanel:OnShow() orginLayer = self.sortingOrder + if _CurPageIndex and _CurPageIndex > #tabs then + _CurPageIndex = #tabs + end this.PageTabCtrl:Init(this.tabbox.gameObject, tabs,_CurPageIndex) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index fda48d5c99..7bfaed68cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -436,9 +436,11 @@ function this.GetActivityTableDataByPageInde(pageIndex) local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups,"PageType",pageIndex) for i = 1 , #configs do if configs[i].ActiveType > 0 then - if not activityDic[configs[i].ActiveType] then - activityDic[configs[i].ActiveType] = configs[i] - table.insert(activityGroupsData,configs[i]) + if ActivityGiftManager.IsActivityTypeOpen(configs[i].ActiveType) then + if not activityDic[configs[i].ActiveType] then + activityDic[configs[i].ActiveType] = configs[i] + table.insert(activityGroupsData,configs[i]) + end end elseif configs[i].FunType > 0 then if not activityDic[configs[i].FunType] then