From 6e0a6d6b56af382866fa90d4bb62fcd510f82ced Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Tue, 28 Sep 2021 15:09:34 +0800
Subject: [PATCH] fix: 礼包兑换码奖励改回放入背包

---
 src/actions/RoleAction.lua | 5 +++--
 src/models/RolePlugin.lua  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/actions/RoleAction.lua b/src/actions/RoleAction.lua
index f49433c..caab21f 100644
--- a/src/actions/RoleAction.lua
+++ b/src/actions/RoleAction.lua
@@ -1369,11 +1369,12 @@ function _M.drawCodeRpc(agent, data)
 	if type(code) ~= "string" then return 1 end
 	if code:find("[^0-9a-zA-Z]") then return 2 end
 
-	local ret, reward = role:getCodeGift(code)
+	local ret, reward, change= role:getCodeGift(code)
 	if ret == 0 then
 		SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
 			result = ret,
-			reward = reward:toNumMap(),
+			reward = reward,
+			change = change,
 		}))
         return true
 	end
diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua
index df63e78..8dd1e26 100644
--- a/src/models/RolePlugin.lua
+++ b/src/models/RolePlugin.lua
@@ -3320,7 +3320,7 @@ function RolePlugin.bind(Role)
 			if ret == 0 then
 				local giftId = tonumber(result.giftId)
 				self:setProperty("codeStr", codestr:setv(giftId, 1))
-				self:sendMail(MailId.DrawCode, nil, result.gift)
+				local reward, change = self:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
 
 				self:log("get_gift", {
 					gift_id = giftId, -- 礼包ID
@@ -3330,7 +3330,7 @@ function RolePlugin.bind(Role)
 					gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
 				})
 				self:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = self:getRewardLogStr(result.gift)})
-				return ret, result.gift
+				return ret, reward, change
 			end
 			-- 1 不存在的礼包码
 			-- 2 已经领取过相同类型物品
--
libgit2 0.21.2