Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
2842fed5e3
|
|
@ -81,7 +81,7 @@ function Expert_UpLv:OnShowData(isTop,isAni)
|
||||||
end)
|
end)
|
||||||
this.ScrollView:SetData(activeData.mission, function (index, go)
|
this.ScrollView:SetData(activeData.mission, function (index, go)
|
||||||
this.SingleItemDataShow(go, activeData.mission[index])
|
this.SingleItemDataShow(go, activeData.mission[index])
|
||||||
end,not isTop,not isAni)
|
end,isTop,not isAni)
|
||||||
if isPlayAnim then
|
if isPlayAnim then
|
||||||
SecTorPlayAnimByScroll(self.ScrollView)
|
SecTorPlayAnimByScroll(self.ScrollView)
|
||||||
isPlayAnim = false
|
isPlayAnim = false
|
||||||
|
|
|
||||||
|
|
@ -1030,6 +1030,8 @@ function this.TimeFormat()
|
||||||
activityTabs[k].go.gameObject:SetActive(false)
|
activityTabs[k].go.gameObject:SetActive(false)
|
||||||
supremHadSet = true
|
supremHadSet = true
|
||||||
end
|
end
|
||||||
|
elseif v.FunType and v.FunType == 41 then
|
||||||
|
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
|
||||||
else
|
else
|
||||||
local info = ActivityGiftManager.GetActivityTypeInfo(v.ActiveType)
|
local info = ActivityGiftManager.GetActivityTypeInfo(v.ActiveType)
|
||||||
local extraTime = 0
|
local extraTime = 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue