Merge branch 'cn/develop-mysql' of 120.26.43.151:wasteland/server into cn/develop-mysql

liuzujun
2 parents 01be2d78 76c9f735
Showing 1 changed file with 6 additions and 13 deletions Show diff stats
src/actions/RoleAction.lua
@@ -1413,22 +1413,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