Commit 49810b001750fe221bba7c1bb35b886735778146
1 parent
fb29343f
fix: 一番赏 抽奖记录 去掉amount字段,改为一个奖品对应一条记录
Showing
1 changed file
with
7 additions
and
6 deletions
Show diff stats
src/models/Capsule.lua
@@ -135,6 +135,9 @@ function Capsule:init() | @@ -135,6 +135,9 @@ function Capsule:init() | ||
135 | --货币类型 | 135 | --货币类型 |
136 | local coin = ichibankuji["token"]:toArray(true, "=") | 136 | local coin = ichibankuji["token"]:toArray(true, "=") |
137 | self:setProperties({coin = coin[1] or 0, token = coin, hideTime = ichibankuji.hide_time, goods = goods, specials = specials, incentive = incentive}) | 137 | self:setProperties({coin = coin[1] or 0, token = coin, hideTime = ichibankuji.hide_time, goods = goods, specials = specials, incentive = incentive}) |
138 | + | ||
139 | + skynet.error("初始化完成") | ||
140 | + dump(self:data()) | ||
138 | end | 141 | end |
139 | 142 | ||
140 | function Capsule:isShow() | 143 | function Capsule:isShow() |
@@ -323,11 +326,7 @@ local rewardToNtyFunc = function(notify, tmpReward) | @@ -323,11 +326,7 @@ local rewardToNtyFunc = function(notify, tmpReward) | ||
323 | end | 326 | end |
324 | 327 | ||
325 | local function getRecordAmount(record) | 328 | local function getRecordAmount(record) |
326 | - local amount = 0 | ||
327 | - for _, v in ipairs(record) do | ||
328 | - amount = amount + v.amount | ||
329 | - end | ||
330 | - return amount | 329 | + return #record |
331 | end | 330 | end |
332 | 331 | ||
333 | 332 | ||
@@ -711,7 +710,9 @@ function Capsule:drawAll(roleId) | @@ -711,7 +710,9 @@ function Capsule:drawAll(roleId) | ||
711 | if good.amount > 0 then | 710 | if good.amount > 0 then |
712 | --插入记录 | 711 | --插入记录 |
713 | local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = good.amount, quality = good.quality, create_time = now} | 712 | local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = good.amount, quality = good.quality, create_time = now} |
714 | - table.insert(record, tmpNotify) | 713 | + for i = 1, good.amount do |
714 | + table.insert(record, {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = 1, quality = good.quality, create_time = now}) | ||
715 | + end | ||
715 | 716 | ||
716 | --作为奖励记录+通知 | 717 | --作为奖励记录+通知 |
717 | if not notify[roleId][good_id] then | 718 | if not notify[roleId][good_id] then |