fix: 一番赏优化; 抽奖记录分页；抽扭蛋机，返回值更新

1. 每次获取最新的20条record，然后再通过指令增量获取抽奖记录 2. 抽扭蛋机，返回值更新，{usual={},special={},incentive={},capsule={}}

fix: 一番赏优化; 抽奖记录分页；抽扭蛋机，返回值更新
1. 每次获取最新的20条record，然后再通过指令增量获取抽奖记录 2. 抽扭蛋机，返回值更新，{usual={},special={},incentive={},capsule={}}
zhangqijia
1 parent 7f21f75b
Showing 5 changed files with 151 additions and 82 deletions Show diff stats
src/ProtocolCode.lua
src/actions/CapsuleAction.lua
src/models/Capsule.lua
src/models/RolePlugin.lua
src/services/capsuled.lua
@@ -285,6 +285,7 @@ actionCodes = {
 	Capsule_exitRpc = 858, -- 退出
 	Capsule_getDataRpc = 859, --获取扭蛋机信息
     Capsule_convertCapsuleRpc = 890, --兑换消耗票
+	Capsule_pageRecordRpc = 891, --抽奖记录分页查询
 }
  
 rpcResponseBegin = 10000
@@ -96,7 +96,7 @@ function _M.drawRpc(agent, data)
     local full = msg.full or 0-- 0=单次，1=十连抽 2=全收
     local cares = msg.cares
  
-    local ret, token, reward, change, rewardByGoods, capsule
+    local ret, token,  change, drawReward, capsule
  
     --检查库存
     if typ == 1 then
@@ -127,26 +127,24 @@ function _M.drawRpc(agent, data)
  
     --开始抽奖
     if typ == 1 then
-        ret, reward, rewardByGoods, capsule = skynet.call(agent.capsule_serv, "lua", "draw_capsule", roleId, capsuleId, full, cares)
+        ret, drawReward, capsule = skynet.call(agent.capsule_serv, "lua", "draw_capsule", roleId, capsuleId, full, cares)
     else
-        ret, reward, rewardByGoods, capsule= role:drawCapsule(capsuleId, full, cares)
+        ret, drawReward, capsule = role:drawCapsule(capsuleId, full, cares)
     end
     if ret < 5 then
         return ret
     end
  
-    --dump(rewardByGoods)
-    --dump(capsule)
-
     if ret == 5 then
-        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack({change = reward, capsule = capsule}))
+        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack({change = drawReward, capsule = capsule}))
         return true
     end
  
-    -- rewardByGoods是抽到的扭蛋信息，reward是抽扭蛋后获得的所有奖励信息。
-    if rewardByGoods and next(rewardByGoods) then
-        reward, change = role:award(reward, {log = {desc = "CapsuleReward", int1 = tonumber(capsuleId), int2 = roleId}})
-        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack({reward = rewardByGoods, capsule = capsule}))
+    if drawReward["reward"] and next(drawReward["reward"]) then
+        _, change = role:award(drawReward["reward"], {log = {desc = "CapsuleReward", int1 = tonumber(capsuleId), int2 = roleId}})
+        drawReward["capsule"] = capsule
+        dump(drawReward)
+        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack(drawReward))
     else
         return ret
     end
@@ -195,4 +193,24 @@ function _M.convertCapsuleRpc(agent, data)
     return true
 end
  
+function _M.pageRecordRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local idx = msg.idx
+    local up = msg.up or 0
+    local capsuleId = msg.capsule_id
+    local typ = msg.typ --0=独享，1= 公开
+
+    local record
+    if typ == 1 then
+        record = skynet.call(agent.capsule_serv, "lua", "page_record", capsuleId, up, idx)
+    else
+        record = role:pageRecord(capsuleId, up, idx)
+    end
+    if not record then return 1 end
+
+    SendPacket(actionCodes.Capsule_pageRecordRpc, MsgPack.pack({record = record}))
+    return true
+end
+
 return _M
 \ No newline at end of file
@@ -673,6 +673,30 @@ function Capsule:checkIncentive(roleId, name, now)
     return {}
 end
  
+local rewardCollect = function(reward, goods)
+    for _, v in pairs(goods) do
+        for id, count in pairs(v.award:toNumMap()) do
+            reward[id] = (reward[id] or 0) + count
+        end
+    end
+end
+
+local rewardCollectByRoleId = function(roleId, reward, goods)
+    local tmp = {}
+    for key, val in pairs(goods) do
+        if roleId == key 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
+            tmp = val
+        end
+    end
+    return tmp
+end
+
 function Capsule:drawByCount(roleId, count)
     if count <= 0 then return nil end
  
@@ -689,9 +713,8 @@ function Capsule:drawByCount(roleId, count)
     local goods_id = ichibankuji["goods_id"]
     local now = skynet.timex()
  
-    --奖励， 通知信息
-    local  notify= {}
-    notify[roleId] = {}
+    --奖励，普通奖品信息
+    local  goodsByUsual= {}
  
     local name = getNameByRoleId(roleId)
     while (goods and next(goods) and count > 0) do
@@ -710,10 +733,10 @@ function Capsule:drawByCount(roleId, count)
             table.insert(record, tmpNotify)
  
             --作为奖励记录+通知
-            if not notify[roleId][good_id] then
-                notify[roleId][good_id] = tmpNotify
+            if not goodsByUsual[good_id] then
+                goodsByUsual[good_id] = tmpNotify
             else
-                notify[roleId][good_id].amount = notify[roleId][good_id].amount + 1
+                goodsByUsual[good_id].amount = goodsByUsual[good_id].amount + 1
             end
  
             --记录角色的抽奖记录 计算激励奖需要用到
@@ -728,35 +751,28 @@ function Capsule:drawByCount(roleId, count)
         end
  
     end
+
+    --奖励池重新赋值
     rank[roleId] = rankRole
     recordByRole[roleId] = roleRecord
     self:setProperties({recordByRole = recordByRole, record = record, goods = goods, rank = rank})
  
-    local tmpNotify = self:checkIncentive(roleId, name, now)
-    for k, v in pairs(tmpNotify) do
-        if not notify[roleId][k] then
-            notify[roleId][k] = v
-        else
-            notify[roleId][k].amount = notify[roleId][k].amount + v.amount
-        end
-    end
+    --奖励收集
+    local reward = {}
+    rewardCollect(reward, goodsByUsual)
  
-    local speciNotify = self:checkSpecialReward(now)
-    rewardToNtyFunc(notify, speciNotify)
-
-    local reward, rewardByGoods = {}, {}
-    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
-                rewardByGoods[k] = v
-            end
-        end
+    local goodsByIncentive = self:checkIncentive(roleId, name, now)
+    rewardCollect(reward, goodsByIncentive)
  
+    local goodsAmount = self:getGoodsAmount()
+    if goodsAmount == 0 then
+        self:setProperty("drawEndTime", now)
     end
-    return reward, rewardByGoods, notify
+
+    local goodsBySpecial = self:checkSpecialReward(now, goodsAmount)
+    local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial)
+
+    return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole}
 end
  
 function Capsule:drawAll(roleId)
@@ -769,8 +785,7 @@ function Capsule:drawAll(roleId)
     local now = skynet.timex()
  
     local name = getNameByRoleId(roleId)
-    local notify = {}
-    notify[roleId] = {}
+    local goodsByUsual = {}
     for good_id, good in pairs(goods) do
         if good.amount > 0 then
             --插入rank
@@ -783,10 +798,10 @@ function Capsule:drawAll(roleId)
             end
  
             --作为奖励记录+通知
-            if not notify[roleId][good_id] then
-                notify[roleId][good_id] = tmpNotify
+            if not goodsByUsual[good_id] then
+                goodsByUsual[good_id] = tmpNotify
             else
-                notify[roleId][good_id].amount = notify[roleId][good_id].amount + good.award
+                goodsByUsual[good_id].amount = goodsByUsual[good_id].amount + good.award
             end
  
             --记录角色的抽奖记录
@@ -804,37 +819,22 @@ function Capsule:drawAll(roleId)
     recordByRole[roleId] = roleRecord
     self:setProperties({recordByRole = recordByRole, record = record, goods = goods, rank = rank})
  
-    local tmpNotify = self:checkIncentive(roleId, name, now)
-    for k, v in pairs(tmpNotify) do
-        if not notify[roleId][k] then
-            notify[roleId][k] = v
-        else
-            notify[roleId][k].amount = notify[roleId][k].amount + v.amount
-        end
-    end
-
-    local goodsAmount = self:getGoodsAmount()
-    local speciNotify = self:checkSpecialReward(now, goodsAmount)
-    rewardToNtyFunc(notify, speciNotify)
-
-    local reward, rewardByGoods = {}, {}
-    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
-                rewardByGoods[k] = v
-            end
-        end
+    --奖励收集
+    local reward = {}
+    rewardCollect(reward, goodsByUsual)
  
-    end
+    local goodsByIncentive = self:checkIncentive(roleId, name, now)
+    rewardCollect(reward, goodsByIncentive)
  
+    local goodsAmount = self:getGoodsAmount()
     if goodsAmount == 0 then
         self:setProperty("drawEndTime", now)
     end
  
-    return reward, rewardByGoods, notify
+    local goodsBySpecial = self:checkSpecialReward(now, goodsAmount)
+    local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial)
+
+    return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole}
 end
  
 --@param
@@ -865,6 +865,33 @@ function Capsule:draw(roleId, full, cares)
     end
 end
  
+function Capsule:pageRecord(up, idx)
+    local record = self:getProperty("record") or {}
+    if not next(record) then return nil end
+
+    --默认取20条
+    idx = idx or #record
+    up = up or 0
+
+    local count = 0
+    local tmpRecord = {}
+    if up == 1 then
+        --向上获取索引更大的  从上往下拉
+        count = math.min(#record - idx, 20)
+        for i = idx, count do
+            tmpRecord[i] = record[i]
+        end
+    else
+        --向下获取索引更小的 从下往上拉
+        count = math.max(idx - 20, 0)
+        for i = count, idx do
+            tmpRecord[i] = record[i]
+        end
+    end
+
+    return tmpRecord
+end
+
  
 function Capsule:data(roleId)
     return {
@@ -875,7 +902,7 @@ function Capsule:data(roleId)
         coin = self:getProperty("coin"),
         onlineCount = self:getOnlineCount(),
         playerStatus = self:getRegisterByRoleId(roleId),
-        record = self:getProperty("record"),
+        record = self:pageRecord() or {},
         rank = self:getProperty("rank"),
         goods = self:getProperty("goods"),
         specials = self:getProperty("specials"),
@@ -3165,16 +3165,19 @@ function RolePlugin.bind(Role)
 	end
  
 	function Role:drawCapsule(capsuleId, full, cares)
-        local capsule = self.capsules[capsuleId] or {}
-		if next(capsule) then
-			local roleId = self:getProperty("id")
-            return capsule:draw(roleId, full, cares)
-		end
-		return 3
+        local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		local roleId = self:getProperty("id")
+		local ret, drawReward = capsule:draw(roleId, full, cares)
+		drawReward["specials"] = nil
+		return ret, drawReward, capsule:data(roleId)
 	end
  
 	function Role:joinCapsule(capsuleId)
-		local capsule = self.capsules[capsuleId] or {}
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
         return capsule:data()
 	end
  
@@ -3188,12 +3191,16 @@ function RolePlugin.bind(Role)
 	end
  
 	function Role:goodStock(capsuleId)
-		local capsule = self.capsules[capsuleId] or {}
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return 0 end
+
 		return capsule:getGoodsAmount(),  capsule:getProperty("token")
 	end
  
 	function Role:getCapsuleData(capsuleId)
-		local capsule = self.capsules[capsuleId] or {}
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
 		return capsule:data()
 	end
  
@@ -3220,6 +3227,13 @@ function RolePlugin.bind(Role)
 			end
 		end
 	end
+
+	function Role:pageRecord(capsuleId, up, idx)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		return capsule:pageRecord(up, idx)
+	end
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -65,6 +65,7 @@ function broadCastCapsule(roleId, capsuleId, broadInfo)
 end
  
 function broadCastSpecial(roleId, capsuleId, broadInfo)
+    if not broadInfo or not next(broadInfo) then return end
     local capsule = capsules[capsuleId]
     if not capsule then skynet.error("not capsule: " .. capsuleId) return end
  
@@ -205,12 +206,13 @@ function CMD.draw_capsule(roleId, capsuleId, full, drawsNum, cares)
     local capsule = capsules[capsuleId]
     if not capsule then skynet.error("not capsule: " .. capsuleId) return 2 end
  
-    local ret, reward, rewardByGoods, notify = capsule:draw(roleId, full, drawsNum, cares)
+    local ret, drawReward = capsule:draw(roleId, full, drawsNum, cares)
     if ret > 5 then
         --broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.DRAW, notify = notify})
-        broadCastSpecial(roleId, capsuleId, notify)
+        broadCastSpecial(roleId, capsuleId, drawReward["specials"])
     end
-    return ret, reward, rewardByGoods, capsule:data(roleId)
+    drawReward["specials"] = nil
+    return ret, drawReward, capsule:data(roleId)
 end
  
 function CMD.register(roleId, capsuleId)
@@ -234,6 +236,13 @@ function CMD.capsule_data(roleId, capsuleId)
     return capsule:data(roleId)
 end
  
+function CMD.page_record(capsuleId, up, idx)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
+    return capsule:pageRecord(up, idx)
+end
+
 skynet.start(function()
     skynet.dispatch("lua", function(session, address, cmd, ...)
         local f = CMD[string.lower(cmd)]