Merge branch 'china/dev' into china/test
commit
954ee0079f
|
@ -891,8 +891,13 @@ function this.FifteenNoticeShow()
|
|||
end
|
||||
|
||||
|
||||
|
||||
|
||||
function this.ShowEffect(isShow)
|
||||
for k,v in ipairs(activitys) do
|
||||
if v.ListType == -1 and activityTabs[k].effect then
|
||||
activityTabs[k].effect.gameObject:SetActive(isShow)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this.CreatActivity()
|
||||
for k,v in ipairs(activitys) do
|
||||
|
@ -1035,6 +1040,7 @@ function this.SetRightBarSize()
|
|||
this.RightUp2rectSize.sizeDelta = Vector3.New(180,t,0)
|
||||
this.RightUp2bgSize.sizeDelta = Vector3.New(180,t + 100,0)
|
||||
end), this.RightUp2gridSize.sizeDelta.y, 0.3):SetEase(Ease.Linear)
|
||||
this.ShowEffect(true)
|
||||
else
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0)
|
||||
--按钮旋转
|
||||
|
@ -1048,6 +1054,7 @@ function this.SetRightBarSize()
|
|||
this.RightUp2rectSize.sizeDelta = Vector3.New(180,t,0)
|
||||
this.RightUp2bgSize.sizeDelta = Vector3.New(180,t + 100,0)
|
||||
end), 220, 0.3):SetEase(Ease.Linear)
|
||||
this.ShowEffect(false)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue