diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index e8f5ee23b1..f5e50903e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -52,6 +52,11 @@ function ActivityMainPanel:RemoveListener() end function ActivityMainPanel:CheckActOpen(_index) + for i = 1, #tabs do + if tabs[i].Sort == _index then + _index = i + end + end if tabs[_index].IfBack == 1 then if tabs[_index].ActiveType > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType) @@ -100,7 +105,7 @@ function ActivityMainPanel:OnOpen(_activityType,_index) break end end - DynamicActivityManager.AddUIList(tabs[_CurPageIndex].Jump) + --DynamicActivityManager.AddUIList(tabs[_CurPageIndex].Jump) end -- 打开,重新打开时回调 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 98e12ef19e..7e0dba5c37 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -34,7 +34,11 @@ function this.RemoveUIList() end end function this.ChangeUIList(jumpId) - this.OpenUIList[#this.OpenUIList] = jumpId + if #this.OpenUIList < 1 then + this.OpenUIList[1] = jumpId + else + this.OpenUIList[#this.OpenUIList] = jumpId + end for i,v in ipairs(this.OpenUIList) do LogGreen("ChangeUIList:"..v) end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 0fbf015070..9cd14090bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -319,6 +319,8 @@ local jumpDic = { else PopupTipPanel.ShowTip(Language[11396]) end + else + this.JumpActivity(JumpType.Expert,data[1]) end end end, @@ -636,6 +638,7 @@ function this.JumpActivity(data,skipfactor) if UIManager.IsOpen(UIName.ActivityMainPanel) then UIManager.ClosePanel(UIName.ActivityMainPanel) end + DynamicActivityManager.AddUIList(this.jumpId) UIManager.OpenPanel(UIName.ActivityMainPanel,data,skipfactor) end -- function this.GetTip(openType,openValue)