diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 6f234a6d9e..13f128257a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -204,11 +204,7 @@ function this.PageTabAdapter(tab, index, status) isshow = true end else - if tabs[index].ActiveType > 0 then - isshow = ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) - elseif tabs[index].FunType > 0 then - isshow = ActTimeCtrlManager.IsQualifiled(tabs[index].FunType) - elseif tabs[index].ActiveType == ActivityTypeDef.FuXingGaoZhao then--福星高照特殊处理 + if tabs[index].ActiveType == ActivityTypeDef.FuXingGaoZhao then--福星高照特殊处理 local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) if ActData then isshow = ActData.value ~= 2 @@ -222,6 +218,11 @@ function this.PageTabAdapter(tab, index, status) else isshow = false end + elseif tabs[index].ActiveType > 0 then + isshow = ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) + elseif tabs[index].FunType > 0 then + isshow = ActTimeCtrlManager.IsQualifiled(tabs[index].FunType) + else isshow = true end diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 1af49df1b0..f4c3780d0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -50,6 +50,10 @@ function FuXingGaoZhaoPanel:BindEvent() MsgPanel.ShowTwo(string.format(Language[12243],costNum,GetLanguageStrById(itemName)), nil, function() NetManager.FuXingStoreBuyRequest(self.data.activityId,function () PopupTipPanel.ShowTip(Language[12244]) + if self.timer then + self.timer:Stop() + self.timer = nil + end self:Refresh() end) end)