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

dev_chengFeng
zhangqiang 2021-03-30 22:37:57 +08:00
commit 8bff7d2ab9
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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