Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
jiaoyangna 2021-05-28 16:22:15 +08:00
commit 9e6c8248df
2 changed files with 10 additions and 5 deletions

View File

@ -204,11 +204,7 @@ function this.PageTabAdapter(tab, index, status)
isshow = true isshow = true
end end
else else
if tabs[index].ActiveType > 0 then if tabs[index].ActiveType == ActivityTypeDef.FuXingGaoZhao 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--福星高照特殊处理
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao)
if ActData then if ActData then
isshow = ActData.value ~= 2 isshow = ActData.value ~= 2
@ -222,6 +218,11 @@ function this.PageTabAdapter(tab, index, status)
else else
isshow = false isshow = false
end 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 else
isshow = true isshow = true
end end

View File

@ -50,6 +50,10 @@ function FuXingGaoZhaoPanel:BindEvent()
MsgPanel.ShowTwo(string.format(Language[12243],costNum,GetLanguageStrById(itemName)), nil, function() MsgPanel.ShowTwo(string.format(Language[12243],costNum,GetLanguageStrById(itemName)), nil, function()
NetManager.FuXingStoreBuyRequest(self.data.activityId,function () NetManager.FuXingStoreBuyRequest(self.data.activityId,function ()
PopupTipPanel.ShowTip(Language[12244]) PopupTipPanel.ShowTip(Language[12244])
if self.timer then
self.timer:Stop()
self.timer = nil
end
self:Refresh() self:Refresh()
end) end)
end) end)