Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
fb57fc97d8
|
@ -1185,20 +1185,24 @@ end
|
|||
function this.RefreshActivityBtn(context)
|
||||
LogGreen("context.type1 " .. context.type .. " " .. context.status)
|
||||
for k,v in ipairs(activitys) do
|
||||
if v.ActiveType > 0 and v.ActiveType == context.type then
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
||||
if v.ActiveType > 0 and v.ActiveType == context.type then
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
||||
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
elseif v.FunType and v.FunType == 41 then
|
||||
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
|
||||
if v.FunType and v.FunType == 41 then
|
||||
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
end
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(false)
|
||||
end
|
||||
elseif v.FunType > 0 and v.FunType == context.type then
|
||||
if ActTimeCtrlManager.SingleFuncState(v.FunType) then
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
elseif v.FunType and v.FunType == 41 then
|
||||
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
|
||||
if v.FunType and v.FunType == 41 then
|
||||
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
end
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(false)
|
||||
end
|
||||
|
@ -1276,7 +1280,7 @@ function this.RefreshActivityShow()
|
|||
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(false)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue