diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua index 9b53235c01..15389e2922 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua @@ -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] diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index a382f4b160..fb65e90db1 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -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()