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

dev_chengFeng
gaoxin 2021-09-24 15:00:57 +08:00
commit c15294b14c
2 changed files with 4 additions and 1 deletions

View File

@ -61,7 +61,9 @@ end
function this:OnShow(_parent,...)
parent=_parent
sortingOrder =_parent.sortingOrder
if _parent then
sortingOrder =_parent.sortingOrder
end
local args = {...}
itemId = args[1]

View File

@ -196,6 +196,7 @@ function QiJieShiLianPanel:Refresh()
self.lastBtn:SetActive(not not QijieStage[QiJieShiLianManager.curLevelId-1])
self.nextBtn:SetActive(QiJieShiLianManager.curMaxStage~=QiJieShiLianManager.curLevelId)
self.treasureRed:SetActive(QiJieShiLianManager.CheckQiJieTreasureRedPoint())
self.treasureBtn:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QiJieTreasure))
self:SetTabBox()
self:SetTopBar()
self:SetBottomBar()