fix: 一番赏抽扭蛋机通知特殊赏，只通知个人所获得的奖励

zhangqijia
1 parent 6304b5ad
Showing 3 changed files with 13 additions and 17 deletions Show diff stats
src/actions/CapsuleAction.lua
src/models/RoleCross.lua
src/services/capsuled.lua
@@ -104,7 +104,7 @@ function _M.drawRpc(agent, data)
     else
         ret, token = role:goodStock(capsuleId)
     end
-    if ret == 0 then skynet.error("零库存 " .. capsuleId) return 1 end
+    if ret == 0 then skynet.error("零库存 " .. capsuleId) return 0 end
  
     --检查余额
     if not next(token) then skynet.error("代币未配置 " .. capsuleId) return 1 end
@@ -211,20 +211,16 @@ RoleCross.bind = function (Role)
 	end
  
 	function Role:paySpecialReward(roleId, notify)
+		dump(notify)
 		if notify and next(notify) then
 			local reward = {}
 			for key, val in pairs(notify) do
-				if key == roleId then
-					for k, v in pairs(val) do
-						for id, count in pairs(v.award:toNumMap()) do
-							reward[id] = (reward[id] or 0) + count
-						end
-					end
+				for id, count in pairs(val.award:toNumMap()) do
+					reward[id] = (reward[id] or 0) + count
 				end
  
 			end
-			local role = require("models.Role").new({key = string.format("%s",roleId), id = roleId})
-			role:award(reward,  {log = {desc = "CapsuleReward", int1=roleId}})
+			self:award(reward,  {log = {desc = "CapsuleReward", int1=roleId}})
 		end
 	end
  
@@ -389,16 +385,14 @@ function CMD.redPTag(roleId, tag, pms)
 end
  
 function CMD.paySpecialReward(roleId, notify)
+	dump(notify)
 	if notify and next(notify) then
-        local reward = {}
+		local reward = {}
 		for key, val in pairs(notify) do
-			if key == roleId then
-				for k, v in pairs(val) do
-					for id, count in pairs(v.award:toNumMap()) do
-						reward[id] = (reward[id] or 0) + count
-					end
-				end
+			for id, count in pairs(val.award:toNumMap()) do
+				reward[id] = (reward[id] or 0) + count
 			end
+
 		end
 		local role = require("models.Role").new({key = string.format("%s",roleId), id = roleId})
 		role:award(reward,  {log = {desc = "CapsuleReward", int1=roleId}})
@@ -68,7 +68,9 @@ function broadCastSpecial(roleId, capsuleId, broadInfo)
     if next(capsule) then
         for id, _ in pairs(register) do
             if id ~= roleId then
-                rpcRole(id, "paySpecialReward", id, broadInfo)
+                if broadInfo[id] then
+                    rpcRole(id, "paySpecialReward", id, broadInfo[id])
+                end
             end
         end
     end