From 885c8bc53c84b85236072f4aff28af58e076f405 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 6 May 2021 18:22:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=85=91=E6=8D=A2=E5=9C=A8?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=B4=BB=E5=8A=A8=E9=87=8C=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/ActivityMainPanel.lua | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index d4def3b00e..8fb4057383 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -60,7 +60,7 @@ function ActivityMainPanel:CheckActOpen(_index) if tabs[_index].IfBack == 1 then if tabs[_index].ActiveType > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType) - if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then + if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then --and (not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt == this.activityType) then _CurPageIndex = _index end elseif tabs[_index].FunType > 0 then @@ -93,11 +93,18 @@ function ActivityMainPanel:OnOpen(_activityType,_index) tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType) --累计充值特殊判断 for i = 1, #tabs do - if tabs[i] and tabs[i].ActiveType > 0 then + if tabs[i] and tabs[i].ActiveType == ActivityTypeDef.AccumulativeRechargeExper then local id = ActivityGiftManager.IsActivityTypeOpen(tabs[i].ActiveType) if id and id > 0 then - local curActiveConfig = ConfigManager.TryGetConfigData(ConfigName.GlobalActivity,id) - if curActiveConfig and curActiveConfig.ShowArt == 3 then--3类型的活动不是限时活动里的累计充值 + if GlobalActConfig[id] and GlobalActConfig[id].ShowArt == 3 then--3类型的活动不是限时活动里的累计充值 + table.remove(tabs,i) + break + end + end + elseif tabs[i] and tabs[i].ActiveType == ActivityTypeDef.LimitExchange then + local id = ActivityGiftManager.IsActivityTypeOpen(tabs[i].ActiveType) + if id and id > 0 then + if GlobalActConfig[id] and GlobalActConfig[id].ShowArt ~= 1 then--3类型的活动不是限时活动里的累计充值 table.remove(tabs,i) break end @@ -190,7 +197,7 @@ function this.PageTabAdapter(tab, index, status) if tabs[index].IfBack == 1 then if tabs[index].ActiveType > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActiveType) - isshow = id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) + isshow = id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) --and (not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt == this.activityType) elseif tabs[index].FunType > 0 then isshow = ActTimeCtrlManager.SingleFuncState(tabs[index].FunType) else