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

jiyue
2 parents 1bf79885 cd2a7a67
Showing 12 changed files with 1216 additions and 3 deletions Show diff stats
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/CapsuleAction.lua
src/agent.lua
src/models/Capsule.lua
src/models/Role.lua
src/models/RoleCross.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/services/agent_ctrl.lua
src/services/capsuled.lua
src/services/watchdog.lua
@@ -274,6 +274,15 @@ actionCodes = {
 	Seaport_taskRpc = 753,
 	Seaport_shopRpc = 754,
 	Seaport_resetRpc = 755,
+
+	Capsule_listRpc = 850, --扭蛋机列表
+	Capsule_joinRpc = 851, --扭蛋机详情
+	Capsule_registerRpc = 853, --报名扭蛋机 "报名"后，抽取按钮才会开放，未报名的玩家分在围观玩家中
+	Capsule_drawRpc = 854, --抽扭蛋机
+	Capsule_switchRoomRpc = 855, --切换扭蛋机房间
+	Capsule_notifyChange = 856, -- 通知信息变动
+	Capsule_payReward = 857, -- 特殊赏 奖励通知
+	Capsule_exitRpc = 858, -- 退出
 }
  
 rpcResponseBegin = 10000
@@ -63,6 +63,15 @@ FRIEND_RECOMMEND = &quot;friend:recommend&quot; -- sort set ç™»å½•æŽ’åº èŽ·å–æŽ¨èå¥½å
 CHAT_OFFLINE = "chat:offline:%d" --æ¶ˆæ¯ç¦»çº¿ç¼“å˜
  
 WORK_BATTLE_COUNT = "global:workbattle" -- ä¸–ç•Œæ¬¡æ•°ç»Ÿè®¡
+
+--Capsule æ‰è›‹æœº
+CAPSULE_INFO= "capsule:info" --set
+CAPSULE_PUBLIC = "capsule:%d:info" --hash
+
+CAPSULE_ID_ROLE = "role:%s:capsule:id" -- set
+CAPSULE_ROLE = "role:%s:capsule:%d" --hash ç‹¬äº«
+
+
 -- FRIEND_DINER_LIKE_KEY = "role:%d:diner:like" -- list
  
 -- UNION_SET = "global:union"
@@ -0,0 +1,132 @@
+local ipairs = ipairs
+local table = table
+local math = math
+local next = next
+local string = string
+local redisproxy = redisproxy
+local MsgPack = MsgPack
+local getRandomName = getRandomName
+local mcast_util = mcast_util
+local string_format = string.format
+local tonumber = tonumber
+local require = require
+
+local _M = {}
+
+function _M.listRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local typ = msg.typ
+    local coin = msg.coin
+
+    local capsules = {}
+    if typ == 1 then
+        local ret = skynet.call(agent.capsule_serv, "lua", "list", coin)
+        if next(ret) then
+            for k, v in pairs(ret) do
+                capsules[k] = v
+            end
+        end
+    elseif typ == 0 then
+        local ret = role:getCapsuleList(coin)
+        if next(ret) then
+            for k, v in pairs(ret) do
+                capsules[k] = v
+            end
+        end
+    end
+
+    SendPacket(actionCodes.Capsule_listRpc, MsgPack.pack(capsules))
+    return true
+end
+
+function _M.joinRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local roleId = role:getProperty("id")
+    local capsuleId = msg.capsule_id --如果刷新则需要传递当前扭蛋机id
+    local typ = msg.typ or 1
+
+    local ret = {}
+    if typ == 1 then
+        ret = skynet.call(agent.capsule_serv, "lua", "join", roleId, capsuleId)
+    elseif typ == 0 then
+        ret = role:joinCapsule()
+    end
+    SendPacket(actionCodes.Capsule_joinRpc, MsgPack.pack(ret))
+    return true
+end
+
+function _M.exitRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local roleId = role:getProperty("id")
+    local capsuleId = msg.capsule_id --如果刷新则需要传递当前扭蛋机id
+    local typ = msg.typ or 1
+
+    local ret = {}
+    if typ == 1 then
+        ret = skynet.call(agent.capsule_serv, "lua", "exit", roleId, capsuleId)
+    elseif typ == 0 then
+        ret = role:exitCapsule()
+    end
+
+    SendPacket(actionCodes.Capsule_exitRpc, MsgPack.pack(ret))
+    return true
+end
+
+function _M.registerRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local roleId = role:getProperty("id")
+    local capsuleId = msg.capsule_id
+
+    local ret = skynet.call(agent.capsule_serv, "lua", "register", roleId, capsuleId)
+    if not ret then return 1 end
+    SendPacket(actionCodes.Capsule_registerRpc, MsgPack.pack(ret))
+    return true
+end
+
+function _M.drawRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local roleId = role:getProperty("id")
+    local capsuleId = msg.capsule_id
+    local typ = msg.typ --0=独享，1= 公开
+    local full = msg.full -- 0=单次，1=十连抽 2=全收
+    local cares = msg.cares
+
+    local ret, reward, change, rewardByGoods, capsule
+    if typ == 1 then
+        ret, reward, rewardByGoods, capsule = skynet.call(agent.capsule_serv, "lua", "draw_capsule", roleId, capsuleId, full, cares)
+    else
+        ret, reward, rewardByGoods, capsule= role:drawCapsule(capsuleId, full, cares)
+    end
+    if ret < 4 then
+        return ret
+    end
+
+    if ret == 4 then
+        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack(reward))
+    end
+
+    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}))
+    else
+        return 5
+    end
+    return true
+end
+
+function _M.switchRoomRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local roleId = role:getProperty("id")
+
+    local ret = skynet.call(agent.capsule_serv, "lua", "switch_room", roleId)
+    SendPacket(actionCodes.Capsule_switchRoomRpc, MsgPack.pack(ret))
+    return true
+end
+
+return _M
 \ No newline at end of file
@@ -254,11 +254,12 @@ skynet.register_protocol {
 }
  
 -- function CMD.start(gate, fd, ip)
-function CMD.start(session, source, gate, fd, ip, hotfixs)
+function CMD.start(session, source, gate, capsuled, fd, ip, hotfixs)
 	ignoreHeartbeat = false
  
 	agentInfo.client_fd = fd
 	agentInfo.gate_serv = gate
+    agentInfo.capsule_serv = capsuled
 	agentInfo.ip = ip
  
 	agent_util:reset()
@@ -282,6 +283,8 @@ function CMD.close()
 	mcast_util.usub_union()
 	local role = agentInfo.role
 	if not role then return end
+
+	skynet.call(agent.capsule_serv, "lua", "exit", role:getProperty("id"))
 	role:log("onLogout", {logtime = skynet.timex()-role:getProperty("ltime")})
 	role:mylog("logout", {int1 = skynet.timex()-role:getProperty("ltime")})
 	role:onOfflineEvent()
@@ -0,0 +1,792 @@
+--扭蛋机
+local MsgPack = MsgPack
+local Capsule = class("Capsule", require("shared.ModelBase"))
+
+function Capsule:ctor(properties)
+    Capsule.super.ctor(self, properties)
+end
+
+RewardType = {
+    GOODS = 1,
+    SPECIAL = 2,
+    INCENTIVE = 3,
+}
+
+SpecialType = {
+    TOP = 1,
+    CORE = 2,
+    LAST = 3,
+    JOKER = 4,
+    KING = 5,
+}
+
+CapsuleType = {
+    PRIVATE = 0,
+    PUBLIC = 1,
+}
+
+--[[
+--通知数据结构
+{ [roleId] = { [good_id1] = { }, [good_id2] = { }, } }
+]]--
+
+Capsule.schema = {
+    id = {"number", 0}, --扭蛋机key，配置读取
+    room = {"number", 0}, --房间号, 配置读取
+    name = {"string"},
+    typ = {"number", 1}, -- 1=共享，2=独享
+    coin = {"number", 0}, --货币代号
+    register = {"table", {}}, --人数 {["id"]=0}, 0 围观， 1 已报名
+    record = {"table", {}}, --抽取记录  列表
+    recordByRole = {"table", {}}, -- 抽取记录，hash， {roleid=record}
+    rank = {"table", {}}, --排行
+    goods = {"table", {}}, --奖励池
+    specials = {"table", {}}, --特殊赏
+    incentive = {"table", {}}, --激励奖
+    incentiveRecord = {"table", {}}, --激励奖记录
+    specialsRecord= {"table", {}}, --特殊赏领取记录
+    resetTimes = {"number", 0}, --每日一次手动重置的机会
+    hideTime = {"number", 0} , --隐藏时间
+    drawEndTime = {"number", 0}, --抽完时间
+}
+
+function Capsule:getResetFields()
+    return {
+        id = self:getProperty("id"),
+        room = self:getProperty("room"),
+        typ = self:getProperty("typ"),
+        coin = 0,
+        register = {},
+        record = {},
+        recordByRole = {},
+        rank = {},
+        goods = {},
+        specials = {},
+        incentive = {},
+        incentiveRecord = {},
+        specialsRecord= {},
+        resetTimes = 0,
+        hideTime = 0,
+        drawEndTime = 0,
+    }
+end
+
+function Capsule:init()
+    local id = self:getProperty("id")
+    local room = self:getProperty("room")
+    self:setProperties(self:getResetFields())
+
+    local ichibankuji = csvdb["ichibankuji_mainCsv"][id][room]
+
+    --奖励池
+    local goods_id = ichibankuji["goods_id"]
+    local goods, specials, incentive = {}, {}, {}
+    for _, data in pairs(csvdb["ichibankuji_goodsCsv"]) do
+        for _, val in pairs(data) do
+            if val.key == goods_id then
+                goods[goods_id..val.id] = clone(val)
+            end
+        end
+    end
+    for _, v in pairs(goods) do
+        v.weight = (v.weight or 0) * v.amount
+    end
+
+    --特殊赏
+    local special_ids = ichibankuji["special_id"]
+    if special_ids ~= "" then
+        for _, special_id in ipairs(special_ids:toArray(true, "=")) do
+            local val = csvdb["ichibankuji_specialCsv"][special_id]
+            if type(val.type) == "number" then
+                specials[special_id] = {np= 1, amount = val.amount, award = val.award, quality = tonumber(val.type), showIndex = val.showIndex}
+            elseif type(val.type) == "string" then
+                local pos = val.type:find("=")
+                if pos then
+                    for k, v in pairs(val.type:toNumMap()) do
+                        specials[special_id] = {np= v, amount = val.amount, award = val.award, quality = k, showIndex = val.showIndex}
+                    end
+                else
+                    specials[special_id] = {np= 1, amount = val.amount, award = val.award, quality = tonumber(val.type), showIndex = val.showIndex}
+                end
+            end
+        end
+    end
+
+    --激励奖
+    local incentive_ids = ichibankuji["incentive_id"]
+    if incentive_ids ~= "" then
+        for _, incentive_id in ipairs(incentive_ids:toArray(true, "=")) do
+            local val = csvdb["ichibankuji_incentiveCsv"][incentive_id]
+            if type(val.type) == "number" then
+                incentive["last"] = {np=val.type, award = val.award}
+            elseif type(val.type) == "string" then
+                for k, v in pairs(val.type:toNumMap()) do
+                    if k == 2 then
+                        incentive["amount"] = {np= v, award = val.award}
+                    elseif k==3 then
+                        incentive["probabilities"] = {np= v, award = val.award}
+                    end
+                end
+            end
+        end
+    end
+    --货币类型
+    local coin = ichibankuji["token"]:toArray(true, "=")
+    self:setProperties({coin = coin[1] or 0, hideTime = ichibankuji.hide_time, goods = goods, specials = specials, incentive = incentive})
+end
+
+function Capsule:isShow()
+    if skynet.timex() >= self:getProperty("hideTime") then
+        return false
+    end
+    return true
+end
+
+function Capsule:refreshing(now)
+    local id = self:getProperty("id")
+    local room = self:getProperty("room")
+    local ichibankuji = csvdb["ichibankuji_mainCsv"][id][room]
+    local reset = tostring(ichibankuji.reset)
+
+    if reset == "0" then
+        return false
+    elseif reset == "1" then
+        if self:getProperty("resetTimes") == 1 then
+            return true
+        end
+        return false
+    else
+        local resetArr = reset:toArray(true, "=")
+        if not next(resetArr) then return false end
+
+        if resetArr[1] == "2" then
+            if self:getGoodsAmount() > 0 then return false end
+
+            local drawEndTime = self:getProperty("drawEndTime") or 0
+            if drawEndTime == 0 then return false end
+
+            if now - drawEndTime >= resetArr[2] then
+                return true
+            end
+            return false
+
+        elseif resetArr[1] == "3" then
+
+        elseif resetArr[1] == "4" then
+            if now >= resetArr[2] then return true end
+        end
+    end
+
+    return false
+end
+
+function Capsule:getOnlineCount()
+    local register = self:getProperty("register") or {}
+    local reg, onlookers = 0, 0
+    for _, v in pairs(register) do
+        if v == 1 then
+            reg = reg + 1
+        else
+            onlookers = onlookers + 1
+        end
+    end
+    return {[0]=onlookers, [1]=reg, [2] = reg+onlookers}
+end
+
+function Capsule:join(roleId)
+    --一个房间最多人数 TODO
+    local register = self:getProperty("register") or {}
+    register[roleId] = 0
+    self:setProperty("register", register)
+    return self:data(roleId)
+end
+
+function Capsule:getRegisterByRoleId(roleId)
+    local register = self:getProperty("register") or {}
+    return register[roleId] or 0
+end
+
+function Capsule:isRegister(roleId)
+    return self:getRegisterByRoleId(roleId) == 1
+end
+
+function Capsule:register(roleId)
+    local register = self:getProperty("register") or {}
+    register[roleId] = 1
+    self:setProperty("register", register)
+    return self:data(roleId)
+end
+
+function Capsule:exit(roleId)
+    local register = self:getProperty("register") or {}
+    if next(register) then
+        register[roleId] = nil
+        return true
+    end
+    return false
+end
+
+function Capsule:confirmed(cares)
+    local goods = self:getProperty("goods") or {}
+    local specials = self:getProperty("specials") or {}
+    local change = {}
+    for k, v in pairs(cares) do
+        if v.typ == 1 then
+            if goods[k] and goods[k].amount ~= v.count then
+                change[k] = goods[k].amount
+            end
+        else
+            if specials[k] and specials[k].amount ~= v.count then
+                change[k] = specials[k].amount
+            end
+        end
+    end
+    return change
+end
+
+function Capsule:getGoodsAmount()
+    local goods = self:getProperty("goods") or {}
+    local amount = 0
+    for _, v in pairs(goods) do
+        amount = amount + v.amount
+    end
+    return amount
+end
+
+function Capsule:getSpecialByType(typ)
+    local specials = self:getProperty("specials") or {}
+    for k, v in pairs(specials) do
+        if v.quality == typ then
+            return k, v
+        end
+    end
+    return nil
+end
+
+function Capsule:checkSpecialFlag(typ)
+    local spKey, special = self:getSpecialByType(typ)
+    if not special then return nil end
+
+    if special["amount"] <= 0 then return nil end
+    return spKey, special
+end
+
+local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
+    local rewardByRole = {}
+    while(count > 0 and next(rewardRecord)) do
+        local roleId = math.randWeight(rewardRecord, "amount")
+        if roleId then
+
+            local tmp = rewardRecord[roleId]
+            tmp["amount"] = tmp["amount"] - 1
+
+            if tmp["amount"] <= 0 then rewardRecord[roleId] = nil end
+
+            tmp = rewardByRole[roleId]
+            if not 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
+
+            count = count - 1
+        end
+    end
+    return rewardByRole, count
+end
+
+function Capsule:getTop(record)
+    local spKey, special = self:checkSpecialFlag(SpecialType.TOP)
+    if not special then return nil end
+    local specials = self:getProperty("specials") or {}
+    local specialsRecord = self:getProperty("specialsRecord") or {}
+
+    if #record < special["np"] then return  nil end
+    local topRecord = {}
+    local count = special["np"]
+    for _, v in ipairs(record) do
+        if count <= 0 then break end
+
+        local tmpCount = 0
+        if count >= v.amount then
+            count = count - v.amount
+            tmpCount = v.amount
+        else
+            tmpCount = count
+            count = 0
+        end
+
+        if not topRecord[v.roleId]then
+            topRecord[v.roleId]  = {amount = v.amount }
+        else
+            topRecord[v.roleId] = {amount = (topRecord[v.roleId]["amount"] or 0) + tmpCount}
+        end
+    end
+
+    local rewardByRole, count = getSpecialRoleNotify(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP)
+
+    special["amount"] = count
+    specials[spKey] = special
+    specialsRecord[SpecialType.TOP] = rewardByRole
+    self:setProperties({specialsRecord = specialsRecord, specials = specials})
+    return rewardByRole
+
+end
+
+--TODO
+function Capsule:getCore(record)
+    local spKey, special = self:checkSpecialFlag(SpecialType.CORE)
+    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 np = special["np"]
+    if np > #record then return nil end
+
+
+    local left = math.ceil((np - #record)/2) or 0
+    local count = np
+    local roleRecord = {}
+    for i, v in ipairs(record) do
+        if count <= 0 then break end
+        if i > left then
+            local tmpCount = 0
+            if count >= v.amount then
+                count = count - v.amount
+                tmpCount = v.amount
+            else
+                tmpCount = count
+                count = 0
+            end
+
+            if not roleRecord[v.roleId]then
+                roleRecord[v.roleId]  = {amount = v.amount }
+            else
+                roleRecord[v.roleId] = {amount = (roleRecord[v.rol_id]["amount"] or 0) + tmpCount}
+            end
+        end
+
+    end
+
+    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.CORE)
+
+    special["amount"] = count
+    specials[spKey] = special
+    specialsRecord[SpecialType.CORE] = rewardByRole
+    self:setProperties({specialsRecord = specialsRecord, specials = specials})
+    return rewardByRole
+end
+
+function Capsule:getLast(record)
+    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 roleRecord = {}
+    for _, v in ipairs(record) do
+        if count <= 0 then break end
+
+        local tmpCount = 0
+        if count >= v.amount then
+            count = count - v.amount
+            tmpCount = v.amount
+        else
+            tmpCount = count
+            count = 0
+        end
+
+        if not roleRecord[v.roleId]then
+            roleRecord[v.roleId]  = {amount = v.amount }
+        else
+            roleRecord[v.roleId] = {amount = (roleRecord[v.rol_id]["amount"] or 0) + tmpCount}
+        end
+    end
+
+    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.LAST)
+
+    special["amount"] = count
+    specials[spKey] = special
+    specialsRecord[SpecialType.LAST] = rewardByRole
+    self:setProperties({specialsRecord = specialsRecord, specials = specials})
+    return rewardByRole
+end
+
+function Capsule:getJoker(record)
+    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
+            roleRecord[v.roleId]  = {amount = v.amount }
+        else
+            roleRecord[v.roleId] = {amount = (roleRecord[v.rol_id]["amount"] or 0) + v.amount}
+        end
+    end
+
+    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.JOKER)
+
+    special["amount"] = count
+    specials[spKey] = special
+    specialsRecord[SpecialType.JOKER] = rewardByRole
+    self:setProperties({specialsRecord = specialsRecord, specials = specials})
+    return rewardByRole
+end
+
+function Capsule:getKing(record)
+    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 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.rol_id]["amount"] or 0) + v.amount}
+        end
+    end
+
+    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.KING)
+    special["amount"] = count
+    specials[spKey] = special
+    specialsRecord[SpecialType.KING] = rewardByRole
+    self:setProperties({specialsRecord = specialsRecord, specials = specials})
+    return rewardByRole
+end
+
+local rewardToNtyFunc = function(notify, tmpReward)
+    for key, val in pairs(tmpReward or {}) do
+        if not notify[key] then
+            notify[key] = 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
+    end
+end
+
+function Capsule:checkSpecialReward( now)
+    local specials = self:getProperty("specials") or {}
+    if not next(specials) then return nil end
+    local record =  self:getProperty("record") or {}
+
+    if not next(record) then return nil end
+    table.sort(record, function(a, b) return a.create_time < b.create_time  end )
+
+
+    local notify = self:getTop(record) or {}
+
+    local coreReward = self:getCore(record)
+    rewardToNtyFunc(notify, coreReward)
+
+    local lastReward = self:getLast(record)
+    rewardToNtyFunc(notify, lastReward)
+
+    local jokerReward = self:getJoker(record)
+    rewardToNtyFunc(notify, jokerReward)
+
+    local kingReward = self:getKing(record)
+    rewardToNtyFunc(notify, kingReward)
+
+    --广播出去TODO
+    --rpcRole(roleId, "paySpecialReward", RewardTYpe.JOKER, jokerReward.award)
+    return notify
+end
+
+function Capsule:checkIncentive(roleId, name, now)
+    local goods = self:getProperty("goods") or {}
+    local recordByRole = self:getProperty("recordByRole") or {}
+    local roleRecord = recordByRole[roleId] or {}
+    local incentiveRecord = self:getProperty("incentiveRecord") or {}
+    local incentiveByRole = incentiveRecord[roleId] or {}
+    local incentive = self:getProperty("incentive")
+
+
+    local notify = {}
+    -- 最后一抽 TODO
+    if incentive["last"] then
+        local last = true
+        for k, v in pairs(goods) do
+            if v and v.amount then
+                last = false
+                break
+            end
+        end
+        if last then
+             notify["last"] = {name = name, good_id = "last", typ = RewardType.INCENTIVE, award = incentive["last"]["award"], amount = 1, quality = 1, create_time= now}
+        end
+    end
+
+    --次数
+    if incentive["amount"] then
+        local amount = 0
+        for _, v in pairs(roleRecord) do
+            if (v.calculated or 0) == 0 then
+                amount = amount + v.amount
+            end
+        end
+
+        local count = math.floor(amount / incentive["amount"]["np"])
+        local tmpCount = count * incentive["amount"]["np"]
+        notify["amount"] = {name = name, good_id = "amount", typ = RewardType.INCENTIVE, award = incentive["amount"]["award"], amount = count, quality = 2, create_time= now}
+
+        --填充v.calculated 字段，标识已经用于每x抽的计算中。
+        for _, v in pairs(roleRecord) do
+            if tmpCount <= 0 then break end
+
+            v.calculated = v.calculated or 0
+            if v.calculated ~= v.amount then
+                if tmpCount <= v.amount then
+                    v.calculated = tmpCount
+                    tmpCount = 0
+                else
+                    v.calculated = v.amount
+                    tmpCount = tmpCount - v.amount
+                end
+            end
+
+        end
+    end
+
+    --概率
+    if incentive["probabilities"] then
+        local probabilities = math.randomInt(1, 100)
+        if probabilities <= incentive["probabilities"]["np"] then
+            notify["probabilities"] = {name = name, good_id = "probabilities", typ = RewardType.INCENTIVE, award = incentive["probabilities"]["award"], amount = 1, quality = 3, create_time= now}
+
+        end
+    end
+    table.insert(incentiveByRole, notify)
+    incentiveRecord[roleId] = incentiveByRole
+    self:setProperty("incentiveRecord", incentiveRecord)
+
+    return notify
+end
+
+function Capsule:drawByCount(roleId, count)
+    if count <= 0 then return nil end
+
+    local goods = self:getProperty("goods") or {}
+    local record = self:getProperty("record") or {}
+    local recordByRole = self:getProperty("recordByRole") or {}
+    local roleRecord = recordByRole[roleId] or {}
+
+    local id = self:getProperty("id")
+    local room = self:getProperty("room")
+    local ichibankuji = csvdb["ichibankuji_mainCsv"][id][room]
+    local goods_id = ichibankuji["goods_id"]
+    local now = skynet.timex()
+
+    --奖励， 通知信息
+    local  notify= {}
+    notify[roleId] = {}
+
+    local name = getNameByRoleId(roleId)
+    while (goods and next(goods) and count > 0) do
+        local good_id = math.randWeight(goods, "weight")
+        if good_id then
+            local good = goods[good_id] or {}
+            if good and good.amount > 0 then
+                good.amount = good.amount - 1
+
+                --插入记录
+                local tmpNotify = {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
+                else
+                    notify[roleId][good_id].amount = notify[roleId][good_id].amount + 1
+                end
+
+                --记录角色的抽奖记录 计算激励奖需要用到
+                if not roleRecord[good_id] then
+                    roleRecord[good_id] = tmpNotify
+                else
+                    roleRecord[good_id].amount = roleRecord[good_id].amount + 1
+                end
+
+                good.weight = good.weight - csvdb["ichibankuji_goodsCsv"][goods_id][good.id].weight
+                count = count - 1
+            end
+        end
+
+    end
+    recordByRole[roleId] = roleRecord
+    self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
+
+    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, 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
+
+    end
+    return reward, rewardByGoods, notify
+end
+
+function Capsule:drawAll(roleId)
+    local goods = self:getProperty("goods") or {}
+    local record = self:getProperty("record") or {}
+    local recordByRole = self:getProperty("recordByRole") or {}
+    local roleRecord = recordByRole[roleId] or {}
+    local now = skynet.timex()
+
+    local name = getNameByRoleId(roleId)
+    local notify = {}
+    notify[roleId] = {}
+    for good_id, good in pairs(goods) do
+        if good.amount > 0 then
+            --插入记录
+            local tmpNotify = {name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = good.amount, quality = good.quality, create_time = now}
+            table.insert(record, notify)
+
+            --作为奖励记录+通知
+            if not notify[roleId][good_id] then
+                notify[roleId][good_id] = tmpNotify
+            else
+                notify[roleId][good_id].amount = notify[roleId][good_id].amount + good.award
+            end
+
+            --记录角色的抽奖记录
+            if not roleRecord[good_id] then
+                roleRecord[good_id] = notify
+            else
+                roleRecord[good_id].amount = roleRecord[good_id].amount + good.amount
+            end
+
+            good.amount = 0
+        end
+
+    end
+    recordByRole[roleId] = roleRecord
+    self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
+
+    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, 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
+
+    end
+    return reward, rewardByGoods, notify
+end
+
+--@param
+--[[
+@roleId
+@typ 0=独享，1=公开
+@cares 关注{k=v}
+]]--
+
+function Capsule:draw(roleId, full, cares)
+    if self:getGoodsAmount() == 0 then return 2 end
+    if self:getProperty("typ") == 1 then
+        --是否报名
+        if self:isRegister(roleId) == false then return 3 end
+
+        --关注的奖品的数量发生了变化
+        if cares then
+            local change = self:confirmed(cares)
+            if next(change) then return 4, change end
+        end
+    end
+
+    if full == 0 then
+        return 5, self:drawByCount(roleId, 1)
+    elseif full == 1 then
+        return 5, self:drawByCount(roleId, 10)
+    elseif full == 2 then
+        return 5, self:drawAll(roleId)
+    end
+end
+
+
+function Capsule:data(roleId)
+    return {
+        id = self:getProperty("id"),
+        room = self:getProperty("room"),
+        typ = self:getProperty("typ"),
+        name = self:getProperty("name"),
+        coin = self:getProperty("coin"),
+        onlineCount = self:getOnlineCount(),
+        playerStatus = self:getRegisterByRoleId(roleId),
+        record = self:getProperty("record"),
+        rank = self:getProperty("rank"),
+        goods = self:getProperty("goods"),
+        specials = self:getProperty("specials"),
+        incentive = self:getProperty("incentive"),
+        specialsRecord= self:getProperty("specialsRecord"),
+    }
+end
+
+return Capsule
 \ No newline at end of file
@@ -28,6 +28,7 @@ function Role:ctor( properties )
 	self.runeBag = {}
 	self.friends = {}
 	self.sparkBag = {}
+	self.capsules = {}
 	self.advData = nil
 	self.activity = nil
 	self._pushToken = nil
@@ -210,6 +210,12 @@ RoleCross.bind = function (Role)
 		return "成功"
 	end
  
+	function Role:paySpecialReward(typ, reward)
+		local tmpReward, _= self:award(reward,  {log = {desc = "specialsReward", int1=self:getKey(), int2 = typ}})
+		SendPacket(actionCodes.Capsule_payReward, MsgPack.pack({reward=tmpReward}))
+        return "reward"
+	end
+
 end
  
  
@@ -370,6 +376,11 @@ function CMD.redPTag(roleId, tag, pms)
 	end
 end
  
+function CMD.paySpecialReward(roleId, typ, reward)
+	local role = require("models.Role").new({key = string.format("%s",roleId), id = roleId})
+	role:award(reward,  {log = {desc = "specialsReward", int1=self:getKey(), int2 = typ}})
+end
+
 RoleCross.handle = function(cmd, roleId, ...)
 	SRole = SRole or require("models.Role")
 	if CMD[cmd] then
@@ -159,6 +159,9 @@ local ItemReason = {
 	seaportTask = 1403, -- 贸易港任务奖励
  
 	returner = 1410, -- 回归者奖励
+
+	CapsuleReward = 1411, --扭蛋机奖励
+	specialsReward = 1412, --特殊赏
 }
  
  
@@ -19,6 +19,7 @@ function RolePlugin.bind(Role)
 		--self:loadRoleIncre()
 		self:loadFriends()
 		self:loadSparks()
+		self:loadCapsules()
 	end
  
 	function Role:reloadWhenLogin()
@@ -821,6 +822,41 @@ function RolePlugin.bind(Role)
 		end
 	end
  
+	function Role:loadCapsules()
+		local now = skynet.timex()
+        local roleId = self:getProperty("id")
+		local res = redisproxy:smembers(CAPSULE_ID_ROLE:format(roleId)) or {}
+		for _, key in pairs(res) do
+			local capsule = require("models.Capsule").new({ key = CAPSULE_ROLE:format(roleId,tonumber(key))})
+			capsule:load()
+			if capsule:isShow() then
+				if capsule:refreshing(now) then
+					capsule:init()
+					capsule:create()
+				end
+				self.capsules[key] = capsule
+			else
+				redisproxy:del(CAPSULE_ROLE:format(roleId, tonumber(key)))
+				redisproxy:srem(CAPSULE_ID_ROLE, key)
+			end
+		end
+
+		for _, data in pairs(csvdb["ichibankuji_mainCsv"]) do
+			for _, val in pairs(data) do
+				if val.typ == 0 then
+					local key = val.id..val.room
+					if not self.capsules[key] then
+						local capsule = require("models.Capsule").new({ key = CAPSULE_ROLE:format(roleId, tonumber(key)), id= val.id, room = val.room, typ = 0, name=val.name})
+						capsule:init()
+						capsule:create()
+                        self.capsules[key] = capsule
+						redisproxy.sadd(CAPSULE_ID_ROLE:format(roleId), key)
+					end
+				end
+			end
+		end
+	end
+
 	-- 0 为操作成功
 	function Role:addRune(params)
 		if params.type and params.id then
@@ -1995,6 +2031,7 @@ function RolePlugin.bind(Role)
 	function Role:onRecoverTimer(now)
 		self:updateTimeReset(now, true)
 		self:checkNewEvent(now)
+		self:checkCapsule(now)
 		self:saveRoleData(now)
 	end
  
@@ -3116,7 +3153,39 @@ function RolePlugin.bind(Role)
 		return itemRandomOccupy
 	end
  
+    function Role:getCapsuleList(coin)
+		local capsules = {}
+		for k, v in pairs(self.capsules) do
+			if v:getProperty("coin") == coin then
+				local onlineCount= v:getOnlineCount()
+				capsules[k] = {id=v:getProperty("id"), room=v:getProperty("room"), typ=v:getProperty("typ"), people=onlineCount[2], coin= v:getProperty("coin")}
+			end
+		end
+        return capsules
+	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 1
+	end
+
+	function Role:joinCapsule(capsuleId)
+		local capsule = self.capsules[capsuleId] or {}
+        return capsule:data()
+	end
  
+	function Role:checkCapsule(now)
+		for _, v in pairs(self.capsules) do
+			if v:refreshing(now) then
+				v:init()
+				v:create()
+			end
+		end
+	end
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -188,7 +188,7 @@ function _M:query_agent(fd, uid, isQueue)
 		end
  
 		local agent = get_a(pack)
-		local ok = pcall(skynet.call, agent, "lua", "start", gate_serv, fd, self.f2i[fd])
+		local ok = pcall(skynet.call, agent, "lua", "start", gate_serv, capsuled, fd, self.f2i[fd])
 		if not ok then
 			query_agent_response(fd, {ret = "INNER_ERROR"})
 			return
@@ -223,7 +223,7 @@ function _M:query_agent(fd, uid, isQueue)
 			end
 		end
  
-		local ok = pcall(skynet.call, agent, "lua", "start", gate_serv, fd, self.f2i[fd], hotfixList)
+		local ok = pcall(skynet.call, agent, "lua", "start", gate_serv, capsuled, fd, self.f2i[fd], hotfixList)
 		if not ok then
 			self.factory:push(agent)
 			query_agent_response(fd, {ret = "INNER_ERROR"})
@@ -0,0 +1,181 @@
+require "ProtocolCode"
+require "shared.init"
+require "GlobalVar"
+require "RedisKeys"
+require "skynet.manager"
+skynet = require "skynet"
+csvdb = require "shared.csvdata"
+redisproxy = require "shared.redisproxy"
+datacenter = require "skynet.datacenter"
+
+local capsules = {}
+local CMD = {}
+
+NotifyChangeType = {
+    JOIN = 1,
+    EXIT = 2,
+    DRAW = 3,
+    SPECIAL = 4,
+    INCENTIVE = 5,
+}
+
+local function rpcRole(roleId, funcName, ...)
+    local fields = ...
+    local agent = datacenter.get("agent", roleId)
+    local roleCross = require("models.RoleCross")
+    if funcName == "getProperties" then
+        return roleCross.handle(funcName, roleId, fields)
+    else
+        return roleCross.handle(funcName, roleId, ...)
+    end
+end
+
+function getNameByRoleId(roleId)
+    return rpcRole(roleId, "getProperty", "name")
+
+end
+
+function broadCastCapsule(roleId, capsuleId, broadInfo)
+    local capsule = capsules[capsuleId] or {}
+    local register = capsule:getProperty("register") or {}
+    if next(capsule) then
+        for id, _ in pairs(register) do
+            if id ~= roleId then
+                rpcRole(id, "SendPacket", actionCodes.Capsule_notifyChange, MsgPack.pack(broadInfo)) 	-- 通知对方
+            end
+        end
+    end
+end
+
+local function getCapsuleId(id, room)
+    return string.format("%d%d", id, room)
+end
+
+
+local function add(roleId, capsuleId)
+    local capsule = capsules[capsuleId] or {}
+    if next(capsule) then
+        capsule:join(roleId)
+        broadCastCapsule(roleId, capsuleId, {changeType = NotifyChangeType.JOIN, roleId = roleId})
+        return capsule:data(roleId)
+    end
+    print("id 不存在: ".. capsuleId)
+    return nil
+end
+
+local function capsuleRefreshing()
+    for _, v in pairs(capsules) do
+        if v:refreshing() then
+            v:init()
+            v:create()
+        end
+    end
+end
+
+--扭蛋机刷新
+local function check_capsules()
+    pcall(capsuleRefreshing)
+    skynet.timeout(60, check_capsules)
+end
+
+function CMD.start()
+    local now = skynet.timex()
+    local res = redisproxy:smembers(CAPSULE_INFO) or {}
+    for _, key in pairs(res) do
+        local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key)})
+        capsule:load()
+        if capsule:isShow() then
+            if capsule:refreshing(now) then
+                capsule:init()
+                capsule:create()
+            end
+            capsules[key] = capsule
+        else
+            redisproxy:del(CAPSULE_PUBLIC:format(key))
+            redisproxy:srem(CAPSULE_INFO, key)
+        end
+    end
+
+    for _, data in pairs(csvdb["ichibankuji_mainCsv"]) do
+        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
+            end
+        end
+    end
+
+    check_capsules()
+end
+
+function CMD.list(coin)
+    local tmpCapsules = {}
+    for k, v in pairs(capsules) do
+        if v:getProperty("coin") == coin then
+            local onlineCount= v:getOnlineCount()
+            tmpCapsules[k] = {id=v:getProperty("id"), room=v:getProperty("room"), typ=v:getProperty("typ"), people=onlineCount[2], coin= v:getProperty("coin")}
+        end
+    end
+    return tmpCapsules
+end
+
+function CMD.join(roleId, capsuleId)
+    if capsuleId then
+        return add(roleId, capsuleId)
+    end
+    return nil
+end
+
+
+function CMD.exit(roleId, capsuleId)
+    if capsuleId then
+        local capsule = capsules[capsuleId] or {}
+        if next(capsule) then
+            capsule:exit(roleId)
+            broadCastCapsule(roleId, capsuleId, {changeType = NotifyChangeType.EXIT, roleId = roleId})
+        end
+    else
+        for _, capsule in pairs(capsules) do
+            if next(capsule) then
+                capsule:exit(roleId)
+                broadCastCapsule(roleId, capsuleId, {changeType = NotifyChangeType.EXIT, roleId = roleId})
+            end
+        end
+    end
+end
+
+function CMD.draw_capsule(roleId, capsuleId, full, cares)
+    local capsule = capsules[capsuleId] or {}
+    if next(capsule) then
+        local ret, reward, rewardByGoods, notify = capsule:draw(roleId, full, cares)
+        --if ret > 4 then
+        --    broadCastCapsule(roleId, capsuleId, {changeType = NotifyChangeType.DRAW, roleId = roleId, notify = notify})
+        --end
+        return ret, reward, rewardByGoods, capsule:data(roleId)
+    end
+    return 1
+end
+
+function CMD.register(roleId, capsuleId)
+    local capsule = capsules[capsuleId] or {}
+    if next(capsule) then
+        return capsule:register(roleId)
+    end
+    return nil
+end
+
+skynet.start(function()
+    skynet.dispatch("lua", function(session, address, cmd, ...)
+        local f = CMD[string.lower(cmd)]
+        skynet.ret(skynet.pack(f(...)))
+    end)
+
+    skynet.register("capsuled")
+    globalCsv = csvdb["GlobalDefineCsv"]
+end)
 \ No newline at end of file
@@ -66,6 +66,8 @@ function CMD.start(conf)
 	skynet.call(gate_serv, "lua", "open" , conf)
  
 	skynet.call(pvpd, "lua", "start")
+
+	skynet.call(capsuled, "lua", "start")
 	-- 开启agent状态检测定时器
 	check_agent_status()
 	-- 创建广播服务
@@ -126,4 +128,5 @@ skynet.start(function()
 	skynet.newservice("services/chated")
 	-- 网关服务
 	gate_serv = skynet.newservice("gate")
+	capsuled = skynet.newservice("services/capsuled")
 end)