Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
8bff7d2ab9
|
|
@ -84,7 +84,7 @@ end
|
|||
-- 打开,重新打开时回调
|
||||
function EveryDayGift:OnShow(_sortingOrder)
|
||||
self.gameObject:SetActive(true)
|
||||
self.sortingOrder = _sortingOrder
|
||||
self.sortingOrder = _sortingOrder or self.sortingOrder
|
||||
self.extra:SetActive(true)
|
||||
self.actId = self.actConfig.ActId
|
||||
self.actType = self.actConfig.ActiveType
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ function GiftPre:SetData(data,_parent,_rechargeNum,sortingOrder)
|
|||
else
|
||||
self.tipImage.gameObject:SetActive(false)
|
||||
end
|
||||
Util.SetParticleSortLayer(self.UI_Effect_MianBan_LiBao_button_01, sortingOrder)
|
||||
Util.SetParticleSortLayer(self.UI_Effect_MianBan_LiBao_button_01, sortingOrder or 0)
|
||||
local isshow = false
|
||||
if self.data.DataType == DynamicActivityManager.selectIndex.dataType then
|
||||
for i = 1 , #DynamicActivityManager.selectIndex.goodsId do
|
||||
|
|
|
|||
Loading…
Reference in New Issue