From 49df162b8a359e4259069bb00939fdd1a708bf44 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Tue, 3 Aug 2021 10:06:24 +0800
Subject: [PATCH] fix: 一番赏 增加drawEndTime,优化获取奖励剩余数量。

---
 src/models/Capsule.lua | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/models/Capsule.lua b/src/models/Capsule.lua
index 9fa7162..9020d9d 100644
--- a/src/models/Capsule.lua
+++ b/src/models/Capsule.lua
@@ -377,7 +377,7 @@ function Capsule:getCore(record, recordAmount,now)
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
 
-    if self:getGoodsAmount() > 0 then return nil end
+
 
     local np = special["np"]
     if np > recordAmount then return nil end
@@ -424,8 +424,6 @@ function Capsule:getLast(record,now)
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
 
-    if self:getGoodsAmount() > 0 then return nil end
-
     table.sort(record, function(a, b) return a.create_time > b.create_time end)
 
     local np = special["np"]
@@ -467,8 +465,6 @@ function Capsule:getJoker(record,now)
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
 
-    if self:getGoodsAmount() > 0 then return nil end
-
     local roleRecord = {}
     for _, v in ipairs(record) do
         if not roleRecord[v.roleId]then
@@ -495,8 +491,6 @@ function Capsule:getKing(record,now)
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
 
-    if self:getGoodsAmount() > 0 then return nil end
-
     local roleRecord = {}
     for _, v in ipairs(record) do
         if not roleRecord[v.roleId]then
@@ -515,7 +509,7 @@ function Capsule:getKing(record,now)
     return rewardByRole
 end
 
-function Capsule:checkSpecialReward( now)
+function Capsule:checkSpecialReward(now, goodsAmount)
     local specials = self:getProperty("specials") or {}
     if not next(specials) then return nil end
     local record =  self:getProperty("record") or {}
@@ -527,18 +521,19 @@ function Capsule:checkSpecialReward( now)
 
     local notify = self:getTop(record, recordAmount,now) or {}
 
-    local coreReward = self:getCore(record, recordAmount, now)
-    rewardToNtyFunc(notify, coreReward)
-
-    local lastReward = self:getLast(record, now)
-    rewardToNtyFunc(notify, lastReward)
+    if goodsAmount == 0 then
+        local coreReward = self:getCore(record, recordAmount, now)
+        rewardToNtyFunc(notify, coreReward)
 
-    local jokerReward = self:getJoker(record, now)
-    rewardToNtyFunc(notify, jokerReward)
+        local lastReward = self:getLast(record, now)
+        rewardToNtyFunc(notify, lastReward)
 
-    local kingReward = self:getKing(record, now)
-    rewardToNtyFunc(notify, kingReward)
+        local jokerReward = self:getJoker(record, now)
+        rewardToNtyFunc(notify, jokerReward)
 
+        local kingReward = self:getKing(record, now)
+        rewardToNtyFunc(notify, kingReward)
+    end
 
     return notify
 end
@@ -742,7 +737,8 @@ function Capsule:drawAll(roleId)
         end
     end
 
-    local speciNotify = self:checkSpecialReward(now)
+    local goodsAmount = self:getGoodsAmount()
+    local speciNotify = self:checkSpecialReward(now, goodsAmount)
     rewardToNtyFunc(notify, speciNotify)
 
     local reward, rewardByGoods = {}, {}
@@ -757,6 +753,11 @@ function Capsule:drawAll(roleId)
         end
 
     end
+
+    if goodsAmount == 0 then
+        self:setProperty("drawEndTime", now)
+    end
+
     return reward, rewardByGoods, notify
 end
 
--
libgit2 0.21.2