diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index 7f79db9364..c23458041e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -49,6 +49,7 @@ local GiftBuy = require("Modules/Expert/GiftBuy") --限时抢购 local diffMonsterBuyData = {}--异妖直购数据 local rechargeCommodityConfig +local GlobalActivityConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) local cursortingOrder @@ -107,7 +108,8 @@ function ExpertPanel:BindEvent() Util.AddClick(self.btnBack, function() --self:ClosePanel() if this.isPlayingLackCatAni == false then - UIManager.OpenPanel(UIName.MainPanel) + -- UIManager.OpenPanel(UIName.MainPanel) + self:ClosePanel() end end) for i = 1, allActivityNum do @@ -486,6 +488,7 @@ function ExpertPanel:OnDestroy() this.luckyCatPanel.OnDestroy() -- this.heroStarGift:OnDestroy() this.upLvRewardGrid:OnDestroy() + this.exChange.OnDestroy() SubUIManager.Close(this.UpView) end --获取开启的活动 和 隐藏显示按钮 @@ -588,8 +591,12 @@ function ExpertPanel:SetOpenActiveBtn() end end --限时兑换 + local num = 1 local LimitExchange = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LimitExchange) - if LimitExchange then + if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange) then + num = GlobalActivityConfig[ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange)].ShowArt + end + if LimitExchange and num == 1 then if LimitExchange.endTime - GetTimeStamp() <= 0 then tabBtns[ExperType.ExChange]:SetActive(false) else