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

dev_chengFeng
zhangqiang 2021-03-30 10:28:12 +08:00
commit fb57fc97d8
1 changed files with 13 additions and 9 deletions

View File

@ -1185,20 +1185,24 @@ end
function this.RefreshActivityBtn(context) function this.RefreshActivityBtn(context)
LogGreen("context.type1 " .. context.type .. " " .. context.status) LogGreen("context.type1 " .. context.type .. " " .. context.status)
for k,v in ipairs(activitys) do for k,v in ipairs(activitys) do
if v.ActiveType > 0 and v.ActiveType == context.type then if v.ActiveType > 0 and v.ActiveType == context.type then
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
activityTabs[k].go.gameObject:SetActive(context.status == 1) if v.FunType and v.FunType == 41 then
elseif v.FunType and v.FunType == 41 then activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else
activityTabs[k].go.gameObject:SetActive(context.status == 1)
end
else else
activityTabs[k].go.gameObject:SetActive(false) activityTabs[k].go.gameObject:SetActive(false)
end end
elseif v.FunType > 0 and v.FunType == context.type then elseif v.FunType > 0 and v.FunType == context.type then
if ActTimeCtrlManager.SingleFuncState(v.FunType) then if ActTimeCtrlManager.SingleFuncState(v.FunType) then
activityTabs[k].go.gameObject:SetActive(context.status == 1) if v.FunType and v.FunType == 41 then
elseif v.FunType and v.FunType == 41 then activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else
activityTabs[k].go.gameObject:SetActive(context.status == 1)
end
else else
activityTabs[k].go.gameObject:SetActive(false) activityTabs[k].go.gameObject:SetActive(false)
end end
@ -1276,7 +1280,7 @@ function this.RefreshActivityShow()
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
else else
activityTabs[k].go.gameObject:SetActive(true) activityTabs[k].go.gameObject:SetActive(true)
end end
else else
activityTabs[k].go.gameObject:SetActive(false) activityTabs[k].go.gameObject:SetActive(false)
end end