diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 6e0f9ccaea..744a84170a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -31,6 +31,7 @@ function ActivityMainPanel:BindEvent() -- 关闭界面打开主城 Util.AddClick(this.btnBack, function() + DynamicActivityManager.NiuQiIndex = 1 ShopManager.SetSelectIndex(0,{}) DynamicActivityManager.RemoveUIList() if #DynamicActivityManager.OpenUIList > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 06ab9f4bcd..cffe45a41a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -13,7 +13,7 @@ this.curActivityType = 0 this.OpenUIList = {} this.selectIndex = {dataType = 0,goodsId = {}} this.selectIndex2 = {dataType = 0,goodsId = {}} - +this.NiuQiIndex = 1 function this.SetSelectIndex(dataType,goodsId,b) this.selectIndex.dataType = dataType this.selectIndex.goodsId = goodsId diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 377cea8b54..346129a741 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -118,6 +118,7 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder) local NiuQiChongTianPanelSwitchView = function(index,bool) self.curPage = index + DynamicActivityManager.NiuQiIndex = self.curPage self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage) self:SetProgress() @@ -127,13 +128,14 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder) self.TabCtrl = TabBox.New() self.TabCtrl:SetTabAdapter(NiuQiChongTianPanelTabAdapter) self.TabCtrl:SetChangeTabCallBack(NiuQiChongTianPanelSwitchView) - self.TabCtrl:Init(self.tabBox, _TabData, self.curIndex) - + self.curPage = DynamicActivityManager.NiuQiIndex or 1 + self.TabCtrl:Init(self.tabBox, _TabData, self.curPage) self:SetTime() end function NiuQiChongTianPanel:SwitchView(index,bool) self.curPage = index + DynamicActivityManager.NiuQiIndex = self.curPage self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage) self:SetProgress()