Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
2dc965137b
|
@ -33244,7 +33244,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 233, y: 405}
|
m_AnchoredPosition: {x: 233, y: 416}
|
||||||
m_SizeDelta: {x: 436, y: 90}
|
m_SizeDelta: {x: 436, y: 90}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8417690811195369441
|
--- !u!222 &8417690811195369441
|
||||||
|
|
|
@ -1580,6 +1580,7 @@ function this.RefreshEightGiftPreview()
|
||||||
else
|
else
|
||||||
this.sgBtn:SetActive(false)
|
this.sgBtn:SetActive(false)
|
||||||
end
|
end
|
||||||
|
this.FifteenNoticeShow()
|
||||||
--十五日
|
--十五日
|
||||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FifteenDayGift) then
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FifteenDayGift) then
|
||||||
FifteenDayGiftManager.InitRewardData()
|
FifteenDayGiftManager.InitRewardData()
|
||||||
|
@ -1597,6 +1598,7 @@ function this.RefreshEightGiftPreview()
|
||||||
this.fgBtn:SetActive(false)
|
this.fgBtn:SetActive(false)
|
||||||
this.rpFifteenDayEffect:SetActive(false)
|
this.rpFifteenDayEffect:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 八日登陆奖励预览
|
-- 八日登陆奖励预览
|
||||||
|
|
Loading…
Reference in New Issue