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