From 692277440e0c4811cf04470eb64a6ac1acdefc40 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Thu, 24 Aug 2023 18:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/module/equip/equip_manager.lua | 18 ++++++++++--------
 lua/app/userdata/equip/equip_data.lua  |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lua/app/module/equip/equip_manager.lua b/lua/app/module/equip/equip_manager.lua
index 1cc91de6..d632787e 100644
--- a/lua/app/module/equip/equip_manager.lua
+++ b/lua/app/module/equip/equip_manager.lua
@@ -8,15 +8,17 @@ function EquipManager:showItemGetPop(heroId, part, id, num)
 end
 
 -- 检查装备礼包状态定时器
-function EquipManager:updateEquipGiftTimer()
-    self:unscheduleGlobal(self.giftSid)
+function EquipManager:updateEquipGiftTimer(isClear)
+    self:unscheduleAll()
 
-    local time = DataManager.EquipData:getGiftNearestRemainTime()
-    if time and time > 0 then
-        Logger.logHighlight("设置装备礼包倒计时:"..time)
-        self.giftSid = self:performWithDelayGlobal(function()
-            DataManager.EquipData:onGiftStateChange()
-        end, time)
+    if not isClear then
+        local time = DataManager.EquipData:getGiftNearestRemainTime()
+        if time and time > 0 then
+            Logger.logHighlight("设置装备礼包倒计时:"..time)
+            self.giftSid = self:performWithDelayGlobal(function()
+                DataManager.EquipData:onGiftStateChange()
+            end, time)
+        end
     end
 end
 
diff --git a/lua/app/userdata/equip/equip_data.lua b/lua/app/userdata/equip/equip_data.lua
index 58383658..40481cf0 100644
--- a/lua/app/userdata/equip/equip_data.lua
+++ b/lua/app/userdata/equip/equip_data.lua
@@ -6,6 +6,7 @@ function EquipData:ctor()
 end
 
 function EquipData:clear()
+    ModuleManager.EquipManager:updateEquipGiftTimer(true)
 end
 
 function EquipData:init(data)