限时兑换在两个活动里出现修改

dev_chengFeng
jiaoyangna 2021-05-06 18:22:15 +08:00
parent 7ec568e48d
commit 885c8bc53c
1 changed files with 12 additions and 5 deletions

View File

@ -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