Commit 76c9f735b01220aaabf76c3818837bb52918848e
1 parent
ca77b8d1
修复钻石兑换招募券bug
Showing
1 changed file
with
6 additions
and
13 deletions
Show diff stats
src/actions/RoleAction.lua
| @@ -1412,22 +1412,15 @@ function _M.diamondConvertRpc(agent, data) | @@ -1412,22 +1412,15 @@ function _M.diamondConvertRpc(agent, data) | ||
| 1412 | if oper == 1 then -- 钻石兑换成虹光玉 | 1412 | if oper == 1 then -- 钻石兑换成虹光玉 |
| 1413 | reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert"}}) | 1413 | reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert"}}) |
| 1414 | elseif oper == 2 then -- 钻石兑换成虹光玉再兑换成招募券 | 1414 | elseif oper == 2 then -- 钻石兑换成虹光玉再兑换成招募券 |
| 1415 | + local allReward = {[ItemId.Jade] = get} | ||
| 1415 | local quan = math.floor(get/globalCsv.recruit_cost) | 1416 | local quan = math.floor(get/globalCsv.recruit_cost) |
| 1416 | - reward[ItemType.Jade] = reward[ItemType.Jade] - quan * globalCsv.recruit_cost | ||
| 1417 | - if reward[ItemType.Jade] == 0 then | ||
| 1418 | - reward[ItemType.Jade] = nil | 1417 | + allReward[ItemType.Jade] = allReward[ItemType.Jade] - quan * globalCsv.recruit_cost |
| 1418 | + if allReward[ItemType.Jade] == 0 then | ||
| 1419 | + allReward[ItemType.Jade] = nil | ||
| 1419 | end | 1420 | end |
| 1420 | if quan > 0 then | 1421 | if quan > 0 then |
| 1421 | - local tReward, tChange = role:award({[70] = quan}, {log = {desc = "convert"}}) | ||
| 1422 | - for id, value in pairs(tReward) do | ||
| 1423 | - reward[id] = reward[id] + value | ||
| 1424 | - end | ||
| 1425 | - if tChange then | ||
| 1426 | - change = change or {} | ||
| 1427 | - for id, value in pairs(tChange) do | ||
| 1428 | - change[id] = change[id] + value | ||
| 1429 | - end | ||
| 1430 | - end | 1422 | + allReward[70] = quan |
| 1423 | + reward, change = role:award(allReward, {log = {desc = "convert"}}) | ||
| 1431 | end | 1424 | end |
| 1432 | end | 1425 | end |
| 1433 | 1426 |