diff --git a/src/models/Capsule.lua b/src/models/Capsule.lua index 45690ef..08d7b13 100644 --- a/src/models/Capsule.lua +++ b/src/models/Capsule.lua @@ -766,7 +766,13 @@ function Capsule:drawByCount(roleId, count) local goodsBySpecial = self:checkSpecialReward(now, goodsAmount) local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial) - return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole} + local drawReward = {} + drawReward["reward"] = reward + drawReward["usual"] = goodsByUsual + drawReward["specials"] = goodsBySpecial + if next(goodsByIncentive) then drawReward["incentive"] = goodsByIncentive end + if next(specialByRole) then drawReward["special"] = specialByRole end + return drawReward end function Capsule:drawAll(roleId) @@ -828,7 +834,13 @@ function Capsule:drawAll(roleId) local goodsBySpecial = self:checkSpecialReward(now, goodsAmount) local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial) - return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole} + local drawReward = {} + drawReward["reward"] = reward + drawReward["usual"] = goodsByUsual + drawReward["specials"] = goodsBySpecial + if next(goodsByIncentive) then drawReward["incentive"] = goodsByIncentive end + if next(specialByRole) then drawReward["special"] = specialByRole end + return drawReward end --@param -- libgit2 0.21.2