Merge branch 'cn/develop' into cn/publish/release

jiyue
2 parents e51f5f1d 6ad7e803
Showing 4 changed files with 6 additions and 6 deletions Show diff stats
src/GlobalVar.lua
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/models/RolePlugin.lua
@@ -374,6 +374,7 @@ MailId = {
 	MyCardBuy = 300,
  
     RechargeBack = 3001,
+	DrawCode = 3002,
 }
  
 TriggerEventType = {
@@ -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
  
@@ -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
@@ -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 已经领取过相同类型物品