From 782fc8e54e1882497e4535c90ab29972e82595eb Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 15 Dec 2022 17:18:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=B0=86=E5=8F=B0=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua | 3 ++- .../~Lua/Modules/Operating/GMSong10WanPanel.lua | 4 ++-- .../~Lua/Modules/Operating/OperatingManager.lua | 4 ++++ .../~Lua/Modules/Recharge/View/EveryDayGiftNew.lua | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index dbf1b95877..a72905eca0 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -491,7 +491,7 @@ function TimeLimitUpHero:OnClose() self.timer:Stop() self.timer = nil end - ClearRedPointObject(RedPointType.TimeLimitWishStore,self.zqbgRed) + if UIManager.IsOpen(UIName.GeneralPopup) then UIManager.ClosePanel(UIName.GeneralPopup) end @@ -500,6 +500,7 @@ end function TimeLimitUpHero:OnDestroy() self.spLoader:Destroy() self.btns = {} + ClearRedPointObject(RedPointType.TimeLimitWishStore,self.zqbgRed) --SubUIManager.Close(self.itemView) self.itemView = nil heroLiveObj=nil diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua index c9b8ff3a62..b2d2fd7859 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua @@ -33,10 +33,10 @@ end --绑定事件(用于子类重写) function GMSong10WanPanel:BindEvent() - Util.AddClick(this.btn_close, function() + Util.AddOnceClick(this.btn_close, function() self:ClosePanel() end) - Util.AddClick(this.btn_get, function() + Util.AddOnceClick(this.btn_get, function() if isCanGet then NetManager.GetActivityRewardRequest(1,11201,function(msg) UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1,function () diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index ea5317d498..472b16af9c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -844,6 +844,10 @@ end function this.CheckTimeLimitHeroStoreRedPoint() local boughtNum = 0 local limitNum = 0 + local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) + if not activityId then + return false + end local shopData = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift) for i = 1, #shopData do if rechargeConfig[shopData[i].goodsId].ShowType == DirectBuyType.XIANSHIMIBAO then diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 6d14b176aa..a68b2ea96e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -531,12 +531,14 @@ end function EveryDayGiftNew:OnClose() + CheckRedPointStatus(RedPointType.TimeLimitWishStore) if self.localTimer then self.localTimer:Stop() self.localTimer = nil end self.gameObject:SetActive(false) self.parent.tabbox.gameObject:SetActive(true) + end function EveryDayGiftNew:OnDestroy()