Commit d67d3ac93d023723a505e4a90294f454a1dd6ffb
Merge branch 'cn/develop' into cn/publish/release
# Conflicts: # src/models/RolePlugin.lua
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
src/models/RolePlugin.lua
| @@ -3320,7 +3320,7 @@ function RolePlugin.bind(Role) | @@ -3320,7 +3320,7 @@ function RolePlugin.bind(Role) | ||
| 3320 | if ret == 0 then | 3320 | if ret == 0 then |
| 3321 | local giftId = tonumber(result.giftId) | 3321 | local giftId = tonumber(result.giftId) |
| 3322 | self:setProperty("codeStr", codestr:setv(giftId, 1)) | 3322 | self:setProperty("codeStr", codestr:setv(giftId, 1)) |
| 3323 | - local reward, change = self:award(result.gift, {log = {desc = "drawCode", int1 = giftId}}) | 3323 | + self:sendMail(MailId.DrawCode, nil, result.gift) |
| 3324 | 3324 | ||
| 3325 | self:log("get_gift", { | 3325 | self:log("get_gift", { |
| 3326 | gift_id = giftId, -- 礼包ID | 3326 | gift_id = giftId, -- 礼包ID |
| @@ -3330,7 +3330,7 @@ function RolePlugin.bind(Role) | @@ -3330,7 +3330,7 @@ function RolePlugin.bind(Role) | ||
| 3330 | gift_reason = 0, -- 礼包发放原因，见发放原因枚举表 | 3330 | gift_reason = 0, -- 礼包发放原因，见发放原因枚举表 |
| 3331 | }) | 3331 | }) |
| 3332 | self:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = self:getRewardLogStr(result.gift)}) | 3332 | self:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = self:getRewardLogStr(result.gift)}) |
| 3333 | - return ret, reward, change | 3333 | + return ret, result.gift |
| 3334 | end | 3334 | end |
| 3335 | -- 1 不存在的礼包码 | 3335 | -- 1 不存在的礼包码 |
| 3336 | -- 2 已经领取过相同类型物品 | 3336 | -- 2 已经领取过相同类型物品 |