fix: 额外宝藏，在宝藏列表并且未过期的宝藏，不会再随机(与每日宝藏逻辑不同)

zhangqijia
1 parent 78065fee
Showing 1 changed file with 13 additions and 10 deletions Show diff stats
src/models/DailyPlugin.lua
@@ -20,7 +20,7 @@ function DailyPlugin.bind(Daily)
     end
     --CD
-    function Daily:checkTreasureExpired(treasureAttr, treasureList)
+    function Daily:checkTreasureExpired(treasureAttr, treasureList, isExtra)
         local curInfo = treasureList[treasureAttr.id]
         local now = skynet.timex()
         if curInfo then
@@ -41,6 +41,10 @@ function DailyPlugin.bind(Daily)
                     end
                     curInfo = clone(treasureAttr)
                 end
+            else
+                if isExtra then
+                    curInfo = nil
+                end
             end
         else
             curInfo = clone(treasureAttr)
@@ -58,7 +62,6 @@ function DailyPlugin.bind(Daily)
         --1. 正在挖宝，未挖到
         --2. 已经挖到宝藏，但未领取
         --3. 正在挂机
-        local now = skynet.timex()
         for _, curInfo in pairs(treasureList or {}) do
             if (not curInfo["expire_time"] and curInfo["end_time"]) then
                 tmp_chapters[curInfo.chapter_id] = curInfo
@@ -85,7 +88,7 @@ function DailyPlugin.bind(Daily)
         return chapters
     end
-    --额外宝藏
+    --绑定通关关卡 额外宝藏
     function Daily:checkChaptersExtra(treasureList, treasureListOther)
         local chapters = {}
         local tmp_chapters = {}
@@ -93,7 +96,6 @@ function DailyPlugin.bind(Daily)
         --不可以绑定的关卡
         --1. 未过期(未挖，在挖，未领)
         --2. 正在挂机
-        local now = skynet.timex()
         for _, curInfo in pairs(treasureList or {}) do
             if not curInfo["expire_time"] then
                 tmp_chapters[curInfo.chapter_id] = curInfo
@@ -307,13 +309,14 @@ function DailyPlugin.bind(Daily)
     --宝藏图鉴
     function Daily:getTreasureList()
-        local tmpcsv = csvdb["idle_treasureCsv"]
         local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
         local treasureListExtra = self:getProperty("treasureListExtra") or {} --额外宝藏列表 过期删除 领取奖励删除 跨天更新
+
+        --获取宝藏列表(与额外宝藏逻辑不同) 进行随机获取宝藏
         local tmpTreasure = {}
         local treasureBase = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
-        for _, val in pairs(tmpcsv) do
-            if self:checkUnlock(val) == true then
+        for _, val in pairs(csvdb["idle_treasureCsv"]) do
+            if self:checkUnlock(val) then
                 local treasure = self:checkTreasureExpired(val, treasureList)
                 if treasure then
                     table.insert(tmpTreasure, treasure)
@@ -380,14 +383,14 @@ function DailyPlugin.bind(Daily)
     end
     function Daily:getTreasureExtra(tmpBaseExtra)
-        local tmpcsv = csvdb["idle_treasureCsv"]
         local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
         local treasureListExtra = self:getProperty("treasureListExtra") or {} --额外宝藏 过期删除 领取奖励删除 跨天更新
+        --获取宝藏列表(排除未过期的宝藏) 进行随机获取宝藏
         local tmpTreasure = {}
-        for _, val in pairs(tmpcsv) do
+        for _, val in pairs(csvdb["idle_treasureCsv"]) do
             if self:checkUnlock(val) then
-                local treasure = self:checkTreasureExpired(val, treasureListExtra)
+                local treasure = self:checkTreasureExpired(val, treasureListExtra, true)
                 if treasure then
                     table.insert(tmpTreasure, treasure)
                 end