From 6ad7e8031e4765d9935fe8439677754bd2caf757 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Tue, 28 Sep 2021 14:50:34 +0800
Subject: [PATCH] fix: 礼包兑换码奖励通过邮件发送

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

diff --git a/src/GlobalVar.lua b/src/GlobalVar.lua
index e035e0f..380514d 100644
--- a/src/GlobalVar.lua
+++ b/src/GlobalVar.lua
@@ -374,6 +374,7 @@ MailId = {
 	MyCardBuy = 300,
 
     RechargeBack = 3001,
+	DrawCode = 3002,
 }
 
 TriggerEventType = {
diff --git a/src/actions/GmAction.lua b/src/actions/GmAction.lua
index cc96df2..5ba2bec 100644
--- a/src/actions/GmAction.lua
+++ b/src/actions/GmAction.lua
@@ -1157,7 +1157,7 @@ function _M.draw_code(role, pms)
 	if type(code) ~= "string" then return -2 end
 	if code:find("[^0-9a-zA-Z]") then return -3 end
 
-	local ret, _, _= role:getCodeGift(code)
+	local ret, _= role:getCodeGift(code)
 	return ret
 end
 
diff --git a/src/actions/RoleAction.lua b/src/actions/RoleAction.lua
index caab21f..f49433c 100644
--- a/src/actions/RoleAction.lua
+++ b/src/actions/RoleAction.lua
@@ -1369,12 +1369,11 @@ 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, change= role:getCodeGift(code)
+	local ret, reward = role:getCodeGift(code)
 	if ret == 0 then
 		SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
 			result = ret,
-			reward = reward,
-			change = change,
+			reward = reward:toNumMap(),
 		}))
         return true
 	end
diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua
index 9684dcb..df63e78 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))
-				local reward, change = self:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
+				self:sendMail(MailId.DrawCode, nil, result.gift)
 
 				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, reward, change
+				return ret, result.gift
 			end
 			-- 1 不存在的礼包码
 			-- 2 已经领取过相同类型物品
--
libgit2 0.21.2