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

* cn/develop: 按500人分线 fix: 一番赏修复广播capsuleId 为空的问题 fix: 一番赏修复king赏bug fix: 一番赏特殊赏的抽奖记录的数据结构修改 fix: 一番赏打开激励奖导致抽奖逻辑性阻塞的bug feat: 一番赏特殊赏通知 1. 服务器主动通知 Capsule_notifyChange = 856 2. 客户端主动获获取 Capsule_specialRewardRpc = 857 3. 客户端消除特殊赏通知指令 Capsule_clearSpecialNtyRpc = 862 fix: 一番赏优化; 抽奖记录分页；抽扭蛋机，返回值更新 fix: 一番赏增加rank，刷新机制完善，修复capsuled 55行报错。 fix: 一番赏增加drawEndTime,优化获取奖励剩余数量。 fix: 一番赏屏蔽初始化日志

Merge branch 'cn/develop' into cn/publish/release
* cn/develop: 按500人分线 fix: 一番赏修复广播capsuleId 为空的问题 fix: 一番赏修复king赏bug fix: 一番赏特殊赏的抽奖记录的数据结构修改 fix: 一番赏打开激励奖导致抽奖逻辑性阻塞的bug feat: 一番赏特殊赏通知 1. 服务器主动通知 Capsule_notifyChange = 856 2. 客户端主动获获取 Capsule_specialRewardRpc = 857 3. 客户端消除特殊赏通知指令 Capsule_clearSpecialNtyRpc = 862 fix: 一番赏优化; 抽奖记录分页；抽扭蛋机，返回值更新 fix: 一番赏增加rank，刷新机制完善，修复capsuled 55行报错。 fix: 一番赏增加drawEndTime,优化获取奖励剩余数量。 fix: 一番赏屏蔽初始化日志
测试
2 parents 606318cb 06c7246e
Showing 9 changed files with 445 additions and 213 deletions Show diff stats
src/ProtocolCode.lua
src/actions/CapsuleAction.lua
src/actions/RoleAction.lua
src/models/Capsule.lua
src/models/RoleCross.lua
src/models/RolePlugin.lua
src/services/agent_ctrl.lua
src/services/capsuled.lua
src/services/watchdog.lua
@@ -281,10 +281,12 @@ actionCodes = {
 	Capsule_drawRpc = 854, --抽扭蛋机
 	--Capsule_switchRoomRpc = 855, --切换扭蛋机房间
 	Capsule_notifyChange = 856, -- 通知信息变动
-	Capsule_payReward = 857, -- 特殊赏 奖励通知
+	Capsule_specialRewardRpc = 857, -- 获取 未领取特殊赏通知 主动
 	Capsule_exitRpc = 858, -- 退出
 	Capsule_getDataRpc = 859, --获取扭蛋机信息
-    Capsule_convertCapsuleRpc = 890, --兑换消耗票
+    Capsule_convertCapsuleRpc = 860, --兑换消耗票
+	Capsule_pageRecordRpc = 861, --抽奖记录分页查询
+	Capsule_clearSpecialNtyRpc = 862, --消除特殊赏通知
 }
 rpcResponseBegin = 10000
@@ -51,7 +51,7 @@ function _M.joinRpc(agent, data)
     if typ == 1 then
         ret = skynet.call(agent.capsule_serv, "lua", "join", roleId, capsuleId)
     elseif typ == 0 then
-        ret = role:joinCapsule()
+        ret = role:joinCapsule(roleId, capsuleId)
     end
     SendPacket(actionCodes.Capsule_joinRpc, MsgPack.pack(ret))
     return true
@@ -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,23 @@ 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
+        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack(drawReward))
     else
         return ret
     end
@@ -164,7 +161,7 @@ function _M.getDataRpc(agent, data)
     if typ == 1 then
         capsule = skynet.call(agent.capsule_serv, "lua", "capsule_data", roleId,  capsuleId)
     else
-        capsule = role:getCapsuleData(capsuleId)
+        capsule = role:getCapsuleData(roleId, capsuleId)
     end
     if not capsule then return 1 end
@@ -195,4 +192,61 @@ 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
+
+function _M.specialRewardRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local capsuleId = msg.capsule_id
+    local typ = msg.typ or 1 --0=独享，1= 公开
+    local roleId = role:getProperty("id")
+
+    local ret
+    if typ == 1 then
+        ret = skynet.call(agent.capsule_serv, "lua", "get_special_nty", roleId, capsuleId)
+    else
+        ret = role:getSpecialNotify(roleId, capsuleId)
+    end
+    if not ret or not next(ret) then return 1 end
+
+    SendPacket(actionCodes.Capsule_specialRewardRpc, MsgPack.pack({special= ret}))
+    return true
+end
+
+function _M.clearSpecialNtyRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local capsuleId = msg.capsule_id
+    local typ = msg.typ --0=独享，1= 公开
+    local good_ids = msg.good_ids
+    local roleId = role:getProperty("id")
+
+    local ret
+    if typ == 1 then
+        ret = skynet.call(agent.capsule_serv, "lua", "clear_special_nty", roleId, capsuleId, good_ids)
+    end
+    if not ret or not next(ret) then return 1 end
+
+    SendPacket(actionCodes.Capsule_clearSpecialNtyRpc, MsgPack.pack({}))
+    return true
+end
+
 return _M
 \ No newline at end of file
@@ -288,7 +288,9 @@ function _M.loginRpc( agent, data )
 	-- 注册全服广播
 	if not role._channelIdx then
-		local channel = math.randomInt(1, 1)
+        local online = datacenter.get("onlineCount") or 0
+        local channel = math.floor(online / 500) + 1
+		--local channel = math.randomInt(1, 1)
 		role._channelIdx = channel
 	end
 	if not mcast_util.channel_world() then
@@ -44,8 +44,8 @@ Capsule.schema = {
     goods = {"table", {}}, --奖励池
     specials = {"table", {}}, --特殊赏
     incentive = {"table", {}}, --激励奖
-    incentiveRecord = {"table", {}}, --激励奖记录
-    specialsRecord= {"table", {}}, --特殊赏领取记录
+    incentiveRecord = {"table", {}}, --激励奖记录 {roleId = {}, roleId={}}
+    specialsRecord= {"table", {}}, --特殊赏领取记录 {1={},2={}} key=触发特殊赏的 抽奖次数， v=特殊赏商品 table
     resetTimes = {"number", 0}, --每日一次手动重置的机会
     hideTime = {"number", 0} , --隐藏时间
     drawEndTime = {"number", 0}, --抽完时间
@@ -136,8 +136,6 @@ function Capsule:init()
     local coin = ichibankuji["token"]:toArray(true, "=")
     self:setProperties({coin = coin[1] or 0, token = coin, hideTime = ichibankuji.hide_time, goods = goods, specials = specials, incentive = incentive})
-    skynet.error("初始化完成")
-    dump(self:data())
 end
 function Capsule:isShow()
@@ -147,6 +145,56 @@ function Capsule:isShow()
     return true
 end
+function Capsule:resetTimeOut(curTime, now)
+    now = now or skynet.timex()
+    local cur4Time = curTime or (specTime({hour = 4},now))
+
+    local interval
+    if cur4Time > now then
+        interval = cur4Time - now
+    elseif cur4Time < now then
+        local nextTime = dayLater(now)
+        interval = nextTime - now
+    elseif cur4Time == now then
+        self:init()
+        self:create()
+
+        local nextTime = dayLater(now)
+        interval = nextTime - now
+    end
+    interval = (interval + 1)* 100
+    skynet.timeout(interval, handler(self,self.resetTimeOut))
+end
+
+function Capsule:reset4TimeOut(curTime, now)
+    now = now or skynet.timex()
+    local interval
+    if curTime > now then
+        interval = curTime - now
+    elseif curTime < now then
+        local nextTime = dayLater(now)
+        interval = nextTime - now
+    elseif curTime == now then
+        self:init()
+        self:create()
+
+        return false
+    end
+    interval = (interval + 1)* 100
+    skynet.timeout(interval, handler(self,self.reset4TimeOut))
+end
+
+function Capsule:checkTime(resetArr, now)
+    if resetArr[1] == "3" then
+        local cur4Time = specTime({hour = 4},now)
+        if now == cur4Time then return true end
+        self:resetTimeOut(cur4Time, now)
+    elseif resetArr[1] == "4" then
+        if now == resetArr[2] then return true end
+        self:reset4TimeOut(resetArr[2], now)
+    end
+end
+
 function Capsule:refreshing(now)
     local id = self:getProperty("id")
     local room = self:getProperty("room")
@@ -175,11 +223,10 @@ function Capsule:refreshing(now)
             end
             return false
-        elseif resetArr[1] == "3" then
-
-        elseif resetArr[1] == "4" then
-            if now >= resetArr[2] then return true end
+        else
+            self:checkTime(resetArr, now)
         end
+
     end
     return false
@@ -276,7 +323,7 @@ function Capsule:checkSpecialFlag(typ)
     return spKey, special
 end
-local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
+local function getSpecialReward(rewardRecord, count, award, spKey, typ, now)
     local rewardByRole = {}
     while(count > 0 and next(rewardRecord)) do
         local roleId = math.randWeight(rewardRecord, "amount")
@@ -287,19 +334,9 @@ local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
             if tmp["amount"] <= 0 then rewardRecord[roleId] = nil end
-            tmp = rewardByRole[roleId] or {}
-            if not next(tmp)  then
-                local name = getNameByRoleId(roleId)
-                tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
-            else
-                if not tmp[spKey] then
-                    local name = getNameByRoleId(roleId)
-                    tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
-                else
-                    tmp[spKey].amount = tmp[spKey].amount + 1
-                end
-            end
-            rewardByRole[roleId] = tmp
+            local name = getNameByRoleId(roleId)
+            tmp = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
+            table.insert(rewardByRole, tmp)
             count = count - 1
         end
@@ -308,20 +345,11 @@ local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
 end
-local rewardToNtyFunc = function(notify, tmpReward)
-    for key, val in pairs(tmpReward or {}) do
-        if not notify[key] then
-            notify[key] = clone(val)
-        else
-            for k, v in pairs(val) do
-                if not notify[key][k] then
-                    notify[key][k] = v
-                else
-                    notify[key][k] = notify[key][k].amount + v.amount
-                end
-            end
-
-        end
+local rewardToRecordFunc = function(specialsRecord, recordAmount, rewardByRole)
+    if not specialsRecord[recordAmount] then
+        specialsRecord[recordAmount] = rewardByRole
+    else
+        table.insert(specialsRecord[recordAmount], rewardByRole)
     end
 end
@@ -359,12 +387,12 @@ function Capsule:getTop(record, recordAmount,now)
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP,now)
+    local rewardByRole, count = getSpecialReward(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
@@ -379,14 +407,13 @@ function Capsule:getCore(record, recordAmount,now)
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
-    if self:getGoodsAmount() > 0 then return nil end
-    local np = special["np"]
-    if np > recordAmount then return nil end
+
+    local count = special["np"]
+    if count > recordAmount then return nil end
-    local left = math.ceil((np - recordAmount)/2) or 0
-    local count = np
+    local left = math.ceil((count - recordAmount)/2) or 0
     local roleRecord = {}
     for i, v in ipairs(record) do
         if count <= 0 then break end
@@ -409,29 +436,26 @@ function Capsule:getCore(record, recordAmount,now)
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.CORE,now)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.CORE,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getLast(record,now)
+function Capsule:getLast(record, recordAmount, now)
     local spKey, special = self:checkSpecialFlag(SpecialType.LAST)
     if not special then return nil end
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
-    if self:getGoodsAmount() > 0 then return nil end
-
     table.sort(record, function(a, b) return a.create_time > b.create_time end)
-    local np = special["np"]
-    local count = np
+    local count = special["np"]
     local roleRecord = {}
     for _, v in ipairs(record) do
         if count <= 0 then break end
@@ -452,25 +476,23 @@ function Capsule:getLast(record,now)
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getJoker(record,now)
+function Capsule:getJoker(record, recordAmount, now)
     local spKey, special = self:checkSpecialFlag(SpecialType.JOKER)
     if not special then return nil end
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
-    if self:getGoodsAmount() > 0 then return nil end
-
     local roleRecord = {}
     for _, v in ipairs(record) do
         if not roleRecord[v.roleId]then
@@ -480,44 +502,55 @@ function Capsule:getJoker(record,now)
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getKing(record,now)
+function Capsule:getKing(record, recordAmount, now)
     local spKey, special = self:checkSpecialFlag(SpecialType.KING)
     if not special then return nil end
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
-
-    if self:getGoodsAmount() > 0 then return nil end
+    local rank = self:getProperty("rank") or {}
+    if not next(rank) then return nil end
     local roleRecord = {}
-    for _, v in ipairs(record) do
-        if not roleRecord[v.roleId]then
-            roleRecord[v.roleId]  = {amount = v.amount }
-        else
-            roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
-        end
+
+    for roleId, count in pairs(rank) do
+        table.insert(roleRecord, {roleId = roleId, count = count})
+    end
+    table.sort(roleRecord, function(a, b) return a.count > b.count end)
+
+    local count = math.min(special["amount"], #roleRecord)
+
+    local rewardByRole = {}
+    local index = 1
+    while (count > 0 ) do
+        count  = count - 1
+        local tmp = roleRecord[index]
+        if not tmp then break end
+        index = index + 1
+
+        local name = getNameByRoleId(tmp.roleId)
+        table.insert(rewardByRole, {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = special["award"], amount = 1, SpecialType.KING, create_time= now})
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.KING,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:checkSpecialReward( now)
+function Capsule:checkSpecialReward(now, goodsAmount)
     local specials = self:getProperty("specials") or {}
     if not next(specials) then return nil end
     local record =  self:getProperty("record") or {}
@@ -529,18 +562,19 @@ function Capsule:checkSpecialReward( now)
     local notify = self:getTop(record, recordAmount,now) or {}
-    local coreReward = self:getCore(record, recordAmount, now)
-    rewardToNtyFunc(notify, coreReward)
+    if goodsAmount == 0 then
+        local coreReward = self:getCore(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, coreReward)
-    local lastReward = self:getLast(record, now)
-    rewardToNtyFunc(notify, lastReward)
+        local lastReward = self:getLast(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, lastReward)
-    local jokerReward = self:getJoker(record, now)
-    rewardToNtyFunc(notify, jokerReward)
-
-    local kingReward = self:getKing(record, now)
-    rewardToNtyFunc(notify, kingReward)
+        local jokerReward = self:getJoker(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, jokerReward)
+        local kingReward = self:getKing(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, kingReward)
+    end
     return notify
 end
@@ -608,12 +642,44 @@ function Capsule:checkIncentive(roleId, name, now)
         end
     end
-    table.insert(incentiveByRole, notify)
+    for k, v in pairs(notify) do
+        if not incentiveByRole[k] then
+            incentiveByRole[k] = v
+        else
+            incentiveByRole[k].amount = incentiveByRole[k].amount + v.amount
+        end
+    end
     incentiveRecord[roleId] = incentiveByRole
     self:setProperty("incentiveRecord", incentiveRecord)
-    --TODO 先屏蔽
-    return {}
+    return incentiveByRole
+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 * v.amount
+        end
+    end
+end
+
+local rewardCollectByRoleId = function(roleId, reward, goods)
+    local tmp = {}
+    for _, val in pairs(goods) do
+        for _, v in ipairs(val) do
+            if v.roleId == roleId then
+                for id, count in pairs(v.award:toNumMap()) do
+                    reward[id] = (reward[id] or 0) + count * v.amount
+                end
+                if not tmp[v.good_id] then
+                    tmp[v.good_id] = v
+                 else
+                    tmp[v.good_id].amount = tmp[v.good_id].amount + v.amount
+                end
+            end
+        end
+    end
+    return tmp
 end
 function Capsule:drawByCount(roleId, count)
@@ -621,6 +687,8 @@ function Capsule:drawByCount(roleId, count)
     local goods = self:getProperty("goods") or {}
     local record = self:getProperty("record") or {}
+    local rank = self:getProperty("rank") or {}
+    local rankRole = rank[roleId] or 0
     local recordByRole = self:getProperty("recordByRole") or {}
     local roleRecord = recordByRole[roleId] or {}
@@ -630,9 +698,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
@@ -643,15 +710,18 @@ function Capsule:drawByCount(roleId, count)
         if good and good.amount > 0 then
             good.amount = good.amount - 1
+            --插入rank
+            rankRole = rankRole + 1
+
             --插入记录
             local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = 1, quality = good.quality, create_time= now}
             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
             --记录角色的抽奖记录 计算激励奖需要用到
@@ -666,48 +736,46 @@ function Capsule:drawByCount(roleId, count)
         end
     end
+
+    --奖励池重新赋值
+    rank[roleId] = rankRole
     recordByRole[roleId] = roleRecord
-    self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
+    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)
     local goods = self:getProperty("goods") or {}
     local record = self:getProperty("record") or {}
+    local rank = self:getProperty("rank") or {}
+    local rankRole = rank[roleId] or 0
     local recordByRole = self:getProperty("recordByRole") or {}
     local roleRecord = recordByRole[roleId] or {}
     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
+            rankRole = rankRole + good.amount
+
             --插入记录
             local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = good.amount, quality = good.quality, create_time = now}
             for i = 1, good.amount do
@@ -715,10 +783,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
             --记录角色的抽奖记录
@@ -732,34 +800,26 @@ function Capsule:drawAll(roleId)
         end
     end
+    rank[roleId] = rankRole
     recordByRole[roleId] = roleRecord
-    self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
+    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 speciNotify = self:checkSpecialReward(now)
-    rewardToNtyFunc(notify, speciNotify)
+    --奖励收集
+    local reward = {}
+    rewardCollect(reward, goodsByUsual)
-    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
 --@param
@@ -790,6 +850,65 @@ 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:getSpecialNotify(roleId)
+    local specialsRecord = self:getProperty("specialsRecord") or {}
+    local tmp = {}
+    for _, goods in pairs(specialsRecord)  do
+        for _, good in ipairs(goods) do
+            if good.roleId == roleId then
+                if not good.nty or good.nty == 0 then
+                    tmp[good.good_id] = good
+                end
+            end
+        end
+    end
+    self:setProperty("specialsRecord", specialsRecord)
+
+    return tmp
+end
+
+function Capsule:clearSpecialNty(roleId, good_ids)
+    local specialsRecord = self:getProperty("specialsRecord") or {}
+    for _, goods in pairs(specialsRecord)  do
+        for _, good in ipairs(goods) do
+            for _, good_id in ipairs(good_ids) do
+                if good_id == good.good_id and good.roleId == roleId then
+                    good.nty = 1
+                end
+            end
+        end
+    end
+    self:setProperty("specialsRecord", specialsRecord)
+end
+
 function Capsule:data(roleId)
     return {
@@ -800,7 +919,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"),
@@ -211,7 +211,6 @@ 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
@@ -221,6 +220,7 @@ RoleCross.bind = function (Role)
 			end
 			self:award(reward,  {log = {desc = "CapsuleReward", int1=roleId}})
+			SendPacket(actionCodes.Capsule_notifyChange, MsgPack.pack({special = notify}))
 		end
 	end
@@ -2090,7 +2090,7 @@ function RolePlugin.bind(Role)
 				local emailSync = math.max(emailSync + 1, globalEmail - EMAIL_LIMIT + 1)
 				local redret = redisproxy:pipelining(function (red)
 					for id = emailSync, globalEmail do
-						red:hgetall(string.format("globalEmail:%s", id))		
+						red:hgetall(string.format("globalEmail:%s", id))
 					end
 				end)
 				for _, data in ipairs(redret) do
@@ -3165,17 +3165,20 @@ 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 {}
-        return capsule:data()
+	function Role:joinCapsule(roleId, capsuleId)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+        return capsule:data(roleId)
 	end
 	function Role:checkCapsule(now)
@@ -3188,13 +3191,17 @@ 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 {}
-		return capsule:data()
+	function Role:getCapsuleData(roleId, capsuleId)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		return capsule:data(roleId)
 	end
 	function Role:resetCapsule()
@@ -3220,6 +3227,20 @@ 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
+
+	function Role:getSpecialNotify(roleId, capsuleId)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		return capsule:getSpecialNotify(roleId)
+	end
 end
 return RolePlugin
 \ No newline at end of file
@@ -141,10 +141,11 @@ function _M:check_agent_status()
 		end
 	end
+    datacenter.set("onlineCount", count)
 	if now >= next_log_time and now % 60 == 0 then
 		next_log_time = now + 60
 		local count = table_nums(self.u2f)
-		datacenter.set("onlineCount", count)
+		--datacenter.set("onlineCount", count)
 		logproxy:log({["@type"] = "online", count = count}, "log")
 	end
 end
@@ -51,7 +51,9 @@ function getNameByRoleId(roleId)
 end
 function broadCastCapsule(roleId, capsuleId, broadInfo)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then print("not capsule :" .. capsuleId) return end
+
     local register = capsule:getProperty("register") or {}
     if next(capsule) then
         for id, _ in pairs(register) do
@@ -63,21 +65,23 @@ function broadCastCapsule(roleId, capsuleId, broadInfo)
 end
 function broadCastSpecial(roleId, capsuleId, broadInfo)
-    local capsule = capsules[capsuleId] or {}
+    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
+
     local register = capsule:getProperty("register") or {}
-    if next(capsule) then
-        for id, _ in pairs(register) do
-            if id ~= roleId then
-                if broadInfo[id] then
-                    rpcRole(id, "paySpecialReward", id, broadInfo[id])
-                end
+    for id, _ in pairs(register) do
+        if id ~= roleId then
+            if broadInfo[id] then
+               rpcRole(id, "paySpecialReward", id, broadInfo[id])
             end
         end
     end
 end
 local function add(roleId, capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return end
     if next(capsule) then
         capsule:join(roleId)
         broadCastCapsule(roleId, capsuleId, {notifyType= NotifyChangeType.JOIN, roleId = roleId})
@@ -88,8 +92,9 @@ local function add(roleId, capsuleId)
 end
 local function capsuleRefreshing()
+    local now = skynet.timex()
     for _, v in pairs(capsules) do
-        if v:refreshing() then
+        if v:refreshing(now) then
             v:init()
             v:create()
         end
@@ -114,13 +119,11 @@ function CMD.reset()
         for _, val in ipairs(data) do
             if val.type == 1 then
                 local key = val.id..val.room
-                if not capsules[key] then
-                    local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name})
-                    capsule:init()
-                    capsule:create()
-                    capsules[key] = capsule
-                    redisproxy:sadd(CAPSULE_INFO, key)
-                end
+                local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name})
+                capsule:init()
+                capsule:create()
+                capsules[key] = capsule
+                redisproxy:sadd(CAPSULE_INFO, key)
             end
         end
     end
@@ -149,11 +152,14 @@ function CMD.start()
             if val.type == 1 then
                 local key = val.id..val.room
                 if not capsules[key] then
-                    local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name})
-                    capsule:init()
-                    capsule:create()
-                    capsules[key] = capsule
-                    redisproxy:sadd(CAPSULE_INFO, key)
+                    if now < val.hide_time then
+                        local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name})
+                        capsule:init()
+                        capsule:create()
+
+                        capsules[key] = capsule
+                        redisproxy:sadd(CAPSULE_INFO, key)
+                    end
                 end
             end
         end
@@ -183,49 +189,76 @@ end
 function CMD.exit(roleId, capsuleId)
     if capsuleId then
-        local capsule = capsules[capsuleId] or {}
-        if next(capsule) then
-            capsule:exit(roleId)
-            broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
-        end
+        local capsule = capsules[capsuleId]
+        if not capsule then skynet.error("not capsule: " .. capsuleId) return end
+
+        capsule:exit(roleId)
+        broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
     else
-        for _, capsule in pairs(capsules) do
+        for id, capsule in pairs(capsules) do
             if next(capsule) then
                 capsule:exit(roleId)
-                broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
+                broadCastCapsule(roleId, id, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
             end
         end
     end
 end
 function CMD.draw_capsule(roleId, capsuleId, full, drawsNum, cares)
-    local capsule = capsules[capsuleId] or {}
-    if next(capsule) then
-        local ret, reward, rewardByGoods, notify = capsule:draw(roleId, full, drawsNum, cares)
-        if ret > 5 then
-            --broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.DRAW, notify = notify})
-            broadCastSpecial(roleId, capsuleId, notify)
-        end
-        return ret, reward, rewardByGoods, capsule:data(roleId)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return 2 end
+
+    local ret, drawReward = capsule:draw(roleId, full, drawsNum, cares)
+    if ret > 5 then
+        --broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.DRAW, notify = notify})
+        broadCastSpecial(roleId, capsuleId, drawReward["specials"])
     end
-    return 2
+    drawReward["specials"] = nil
+    return ret, drawReward, capsule:data(roleId)
 end
 function CMD.register(roleId, capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
     return capsule:register(roleId)
 end
 function CMD.goods_stock(capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return 0 end
+
     return capsule:getGoodsAmount(), capsule:getProperty("token")
 end
 function CMD.capsule_data(roleId, capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
     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
+
+function CMD.get_special_nty(roleId, capsuleId)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
+    return capsule:getSpecialNotify(roleId)
+end
+
+function CMD.clear_special_nty(roleId, capsuleId, good_ids)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
+    return capsule:clearSpecialNty(roleId, good_ids)
+end
+
 skynet.start(function()
     skynet.dispatch("lua", function(session, address, cmd, ...)
         local f = CMD[string.lower(cmd)]
@@ -56,7 +56,7 @@ end
 -- 创建world以及union channel 用于广播
 function create_mutilcast()
-	for i = 1, 10 do
+	for i = 1, 50 do
 		local chan_w = mc:new()
 		datacenter.set("MC_W_CHANNEL" .. i, chan_w.channel)
 	end