From 76c9f735b01220aaabf76c3818837bb52918848e Mon Sep 17 00:00:00 2001
From: chenyueqi <chenyueqi@qq.com>
Date: Tue, 30 Mar 2021 20:27:16 +0800
Subject: [PATCH] 修复钻石兑换招募券bug

---
 src/actions/RoleAction.lua | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/actions/RoleAction.lua b/src/actions/RoleAction.lua
index 7b49144..57c659e 100644
--- a/src/actions/RoleAction.lua
+++ b/src/actions/RoleAction.lua
@@ -1412,22 +1412,15 @@ function _M.diamondConvertRpc(agent, data)
 	if oper == 1 then -- 钻石兑换成虹光玉
 		reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert"}})
 	elseif oper == 2 then -- 钻石兑换成虹光玉再兑换成招募券
+		local allReward = {[ItemId.Jade] = get}
 		local quan = math.floor(get/globalCsv.recruit_cost)
-		reward[ItemType.Jade] = reward[ItemType.Jade] - quan * globalCsv.recruit_cost
-		if reward[ItemType.Jade] == 0 then
-			reward[ItemType.Jade] = nil
+		allReward[ItemType.Jade] = allReward[ItemType.Jade] - quan * globalCsv.recruit_cost
+		if allReward[ItemType.Jade] == 0 then
+			allReward[ItemType.Jade] = nil
 		end
 		if quan > 0 then
-			local tReward, tChange = role:award({[70] = quan}, {log = {desc = "convert"}})
-			for id, value in pairs(tReward) do
-				reward[id] = reward[id] + value
-			end
-			if tChange then
-				change = change or {}
-				for id, value in pairs(tChange) do
-					change[id] = change[id] + value
-				end
-			end
+			allReward[70] = quan
+			reward, change = role:award(allReward, {log = {desc = "convert"}})
 		end
 	end
 
--
libgit2 0.21.2