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

dev_chengFeng
ZhangBiao 2021-07-23 17:15:15 +08:00
commit 2dc965137b
2 changed files with 3 additions and 1 deletions

View File

@ -33244,7 +33244,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8417690811195369441

View File

@ -1580,6 +1580,7 @@ function this.RefreshEightGiftPreview()
else
this.sgBtn:SetActive(false)
end
this.FifteenNoticeShow()
--十五日
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FifteenDayGift) then
FifteenDayGiftManager.InitRewardData()
@ -1597,6 +1598,7 @@ function this.RefreshEightGiftPreview()
this.fgBtn:SetActive(false)
this.rpFifteenDayEffect:SetActive(false)
end
end
-- 八日登陆奖励预览