feat: 一番赏扭蛋机信息-增加roleProgress字段，标识抽取进度。

zhangqijia
1 parent 639bbdff
Showing 1 changed file with 30 additions and 16 deletions Show diff stats
src/models/Capsule.lua
@@ -621,24 +621,25 @@ function Capsule:checkIncentive(roleId, name, now)
         end
  
         local count = math.floor(amount / incentive["amount"]["np"])
-        local tmpCount = count * incentive["amount"]["np"]
-        notify["amount"] = {name = name, roleId= roleId, good_id = "amount", typ = RewardType.INCENTIVE, award = incentive["amount"]["award"], amount = count, quality = 2, create_time= now}
-
-        --填充v.calculated 字段，标识已经用于每x抽的计算中。
-        for _, v in pairs(roleRecord) do
-            if tmpCount <= 0 then break end
-
-            v.calculated = v.calculated or 0
-            if v.calculated ~= v.amount then
-                if tmpCount <= v.amount then
-                    v.calculated = tmpCount
-                    tmpCount = 0
-                else
-                    v.calculated = v.amount
-                    tmpCount = tmpCount - v.amount
+        if count > 0 then
+            local tmpCount = count * incentive["amount"]["np"]
+            notify["amount"] = {name = name, roleId= roleId, good_id = "amount", typ = RewardType.INCENTIVE, award = incentive["amount"]["award"], amount = count, quality = 2, create_time= now}
+
+            --填充v.calculated 字段，标识已经用于每x抽的计算中。
+            for _, v in pairs(roleRecord) do
+                if tmpCount <= 0 then break end
+
+                v.calculated = v.calculated or 0
+                if v.calculated ~= v.amount then
+                    if tmpCount <= v.amount then
+                        v.calculated = tmpCount
+                        tmpCount = 0
+                    else
+                        v.calculated = v.amount
+                        tmpCount = tmpCount - v.amount
+                    end
                 end
             end
-
         end
     end
  
@@ -917,6 +918,18 @@ function Capsule:clearSpecialNty(roleId, good_ids)
     self:setProperty("specialsRecord", specialsRecord)
 end
  
+function Capsule:getRoleProgress(roleId)
+    local recordByRole = self:getProperty("recordByRole") or {}
+    local roleRecord = recordByRole[roleId] or {}
+    local amount = 0
+    for _, v in pairs(roleRecord) do
+        v.calculated = v.calculated or 0
+        if v.calculated ~= v.amount then
+            amount = amount + (v.amount - v.calculated)
+        end
+    end
+    return amount
+end
  
 function Capsule:data(roleId)
     return {
@@ -933,6 +946,7 @@ function Capsule:data(roleId)
         specials = self:getProperty("specials"),
         incentive = self:getProperty("incentive"),
         specialsRecord= self:getProperty("specialsRecord"),
+        roleProgress = self:getRoleProgress(roleId),
     }
 end