Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
d8ffbe8600
|
|
@ -1101,7 +1101,6 @@ function this.TimeFormat()
|
|||
this.jingying:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
for k,v in pairs(activitys) do
|
||||
local ishow = DynamicActivityManager.IsQualifiled(v.Id)
|
||||
if ishow then
|
||||
|
|
@ -1355,8 +1354,10 @@ function this.RefreshActivityBtn(context)
|
|||
if tempConfig then
|
||||
activityTabs[k].img.sprite = this.spLoader:LoadSprite(tempConfig.Icon[1])
|
||||
end
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
end
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
end
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(false)
|
||||
end
|
||||
|
|
@ -1365,8 +1366,8 @@ function this.RefreshActivityBtn(context)
|
|||
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
|
||||
activityTabs[k].go.gameObject:SetActive(context.status == 1)
|
||||
end
|
||||
else
|
||||
activityTabs[k].go.gameObject:SetActive(false)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue