锦标赛战令、礼包购买次数刷新fix

lua/app/module/activity/tourn_arena/tourn_arena_manager.lua

@@ -24,6 +24,7 @@ function TournArenaManager:initTimer()
         Logger.logHighlight("竞技场锦标赛活动开始倒计时："..DataManager.TournArenaData:getStartRemainTime())
         self.actSid = self:performWithDelayGlobal(function()
             Logger.logHighlight("竞技场锦标赛活动开始")
+            DataManager.ShopData:resetTournArenaGift()
             self:reqActData()
         end, DataManager.TournArenaData:getStartRemainTime())
     end

lua/app/module/activity/tourn_wave/tourn_wave_manager.lua

@@ -18,6 +18,7 @@ function TournWaveManager:initTimer()
         Logger.logHighlight("波次锦标赛活动开始倒计时："..DataManager.TournWaveData:getStartRemainTime())
         self.actSid = self:performWithDelayGlobal(function()
             Logger.logHighlight("波次锦标赛活动开始")
+            DataManager.ShopData:resetTournWaveGift()
             self:reqActData()
         end, DataManager.TournWaveData:getStartRemainTime())
     end

lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua

@@ -222,12 +222,21 @@ end
 
 -- 战令档位是否已解锁
 function TournArenaData:isBountyGradeUnlock(grade)
+    local giftId
     if grade == GConst.TournArenaConst.BOUNTY_GRADE_TYPE.FREE then
         return true
     elseif grade == GConst.TournArenaConst.BOUNTY_GRADE_TYPE.PAY1 then
-        return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.TournArenaConst.BOUNTY_GIFT_ID_1) > 0
+        giftId = GConst.TournArenaConst.BOUNTY_GIFT_ID_1
     elseif grade == GConst.TournArenaConst.BOUNTY_GRADE_TYPE.PAY2 then
-        return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.TournArenaConst.BOUNTY_GIFT_ID_2) > 0
+        giftId = GConst.TournArenaConst.BOUNTY_GIFT_ID_2
+    end
+
+    local giftData = DataManager.ShopData:getActGiftDetailData(PayManager.PURCHARSE_TYPE.ACT_GIFT, giftId)
+    if giftData and giftData.buy_count > 0 and giftData.latest_buy_at then
+        local time = giftData.latest_buy_at // 1000
+        if time > self.startTime and time < self.endTime then
+            return true
+        end
     end
     return false
 end

lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua

@@ -238,12 +238,21 @@ end
 
 -- 战令档位是否已解锁
 function TournWaveData:isBountyGradeUnlock(grade)
+    local giftId
     if grade == GConst.TournWaveConst.BOUNTY_GRADE_TYPE.FREE then
         return true
     elseif grade == GConst.TournWaveConst.BOUNTY_GRADE_TYPE.PAY1 then
-        return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.TournWaveConst.BOUNTY_GIFT_ID_1) > 0
+        giftId = GConst.TournWaveConst.BOUNTY_GIFT_ID_1
     elseif grade == GConst.TournWaveConst.BOUNTY_GRADE_TYPE.PAY2 then
-        return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.TournWaveConst.BOUNTY_GIFT_ID_2) > 0
+        giftId = GConst.TournWaveConst.BOUNTY_GIFT_ID_2
+    end
+
+    local giftData = DataManager.ShopData:getActGiftDetailData(PayManager.PURCHARSE_TYPE.ACT_GIFT, giftId)
+    if giftData and giftData.buy_count > 0 and giftData.latest_buy_at then
+        local time = giftData.latest_buy_at // 1000
+        if time > self.startTime and time < self.endTime then
+            return true
+        end
     end
     return false
 end

lua/app/userdata/shop/shop_data.lua

@@ -1046,4 +1046,20 @@ function ShopData:resetRunesGift()
     end
 end
 
+-- 重置波次锦标赛礼包次数
+function ShopData:resetTournWaveGift()
+    local ids = GConst.TournWaveConst.GIFT_IDS
+    for index, id in ipairs(ids) do
+        self:resetGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, id)
+    end
+end
+
+-- 重置竞技场锦标赛礼包次数
+function ShopData:resetTournArenaGift()
+    local ids = GConst.TournArenaConst.GIFT_IDS
+    for index, id in ipairs(ids) do
+        self:resetGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, id)
+    end
+end
+
 return ShopData