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

jiyue
2 parents 7800f879 b35c0d0b
Showing 23 changed files with 945 additions and 367 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CapsuleAction.lua
src/actions/GmAction.lua
src/actions/HttpAction.lua
src/actions/RoleAction.lua
src/actions/SeaportAction.lua
src/actions/StoreAction.lua
src/agent.lua
src/csvdata
src/models/Activity.lua
src/models/Capsule.lua
src/models/RoleCross.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
src/services/agent_ctrl.lua
@@ -383,6 +383,11 @@ TriggerEventType = {
 	AfterTs = 7, 	-- 某时间以后
 	DrawHeroCnt = 8,	-- 每日抽卡次数
 	Appoint = 0, -- 触发指定id礼包
+	SignIn = 9,	-- 签到
+    DrawHero = 10,  -- 循环抽卡
+    FoodSell = 11,  -- 循环卖菜
+    RuneUp = 12,    -- 循环强化符文
+    CostDiamond = 13,   -- 循环消耗钻石
 }
 DrawCardType = {
@@ -59,7 +59,7 @@ actionCodes = {
     Role_runeBuyRpc = 142,   	-- 铭文购买
     Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
     Role_setBgRpc = 144,   	-- 设置看板娘
-	Role_itemExchangeRpc = 145, -- 道具兑换
+	Role_itemConvertMonthCardRpc = 145, -- 兑换月卡道具
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -279,10 +279,14 @@ actionCodes = {
 	Capsule_joinRpc = 851, --扭蛋机详情
 	Capsule_registerRpc = 853, --报名扭蛋机 "报名"后，抽取按钮才会开放，未报名的玩家分在围观玩家中
 	Capsule_drawRpc = 854, --抽扭蛋机
-	Capsule_switchRoomRpc = 855, --切换扭蛋机房间
+	--Capsule_switchRoomRpc = 855, --切换扭蛋机房间
 	Capsule_notifyChange = 856, -- 通知信息变动
-	Capsule_payReward = 857, -- 特殊赏 奖励通知
+	Capsule_specialRewardRpc = 857, -- 获取 未领取特殊赏通知 主动
 	Capsule_exitRpc = 858, -- 退出
+	Capsule_getDataRpc = 859, --获取扭蛋机信息
+    Capsule_convertCapsuleRpc = 860, --兑换消耗票
+	Capsule_pageRecordRpc = 861, --抽奖记录分页查询
+	Capsule_clearSpecialNtyRpc = 862, --消除特殊赏通知
 }
 rpcResponseBegin = 10000
@@ -605,6 +605,8 @@ function _M.startBattleRpc(agent, data)
                 end
 			end
             num = num * count
+        else
+            num = 0
 		end
 		if ticket < num then
 			return 6
@@ -643,7 +645,7 @@ function _M.startBattleRpc(agent, data)
 			award[k] = v * count
 		end
 		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
-		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
+
         changeFlag = true
         actData["ticket"] = ticket - num
@@ -663,11 +665,15 @@ function _M.startBattleRpc(agent, data)
             end
             role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
 		end
+        role.activity:updateActData("ChallengeLevel", actData)
+		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
+
+        return true
 	end
-	if changeFlag then
-		role.activity:updateActData("ChallengeLevel", actData)
-	end
+	--if changeFlag then
+	--	role.activity:updateActData("ChallengeLevel", actData)
+	--end
 	return true
 end
@@ -801,10 +807,12 @@ function _M.endBattleRpc(agent, data)
 	end
 	if battleCfg.rank ~= 0 and isWin then
-		-- 消耗门票
-		role.activity:getBattleTicket(actid)
-		local num = battleCfg.type:toArray(true, "=")[3]
-		actData["ticket"] = math.max(actData["ticket"] - num, 0)
+        if battleCfg.type ~= "" then
+            -- 消耗门票
+            role.activity:getBattleTicket(actid)
+            local num = battleCfg.type:toArray(true, "=")[3]
+            actData["ticket"] = math.max(actData["ticket"] - num, 0)
+        end
 		-- 更新排行榜 最高伤害
 		battleInfo["top"] = math.max(battleInfo["top"] or 0, dmg)
@@ -1337,8 +1345,8 @@ function _M.buyBattleCommandLvlRpc(agent, data)
 	end
 	if cost == 0 then return 5 end
-	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 6 end
-	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "actBuyBpLevel", int1 = curLvl}})
+	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return 6 end
+	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "actBuyBpLevel", int1 = curLvl}})
 	actData["lvl"] = nextLvl
 	role.activity:updateActData("BattleCommand", actData)
 	role:mylog("act_action", {desc="buyBcLvl", int1=count, int2=nextLvl})
@@ -1486,7 +1494,7 @@ function _M.buyBattleTicketRpc(agent, data)
     end
     local cost = globalCsv.activity_scrofa_tickets[curCount + 1]
 	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 3 end
-	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyActivityBattleTicket", int1 = actid, int2 = count, cint1 = curCount}})
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyActivityBattleTicket", int1 = actid, int2 = count, long1 = curCount}})
     actData["ticket"] = (actData["ticket"] or 0) + 1
     actData["buyC"] = curCount + count
@@ -459,11 +459,12 @@ function _M.endHangRpc(agent, data)
 			heroCnt = heroCnt + 1
 		end
-		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
-
-		local idleReward = totalReward:toNumMap()
-		for itemId, count in pairs(idleReward) do
-			idleReward[itemId] = count * adv_idle_reward_coef
+		local idleReward = {}
+		for k, v in pairs(campSiteData.idleReward_1:toNumMap()) do
+			idleReward[k] = (idleReward[k] or 0) + v * adv_idle_reward_coef
+		end
+		for k, v in pairs(campSiteData.idleReward_2:toNumMap()) do
+			idleReward[k] = (idleReward[k] or 0) + v * adv_idle_reward_coef
 		end
 		local bnousReward = role:getBnousAdv()
@@ -17,18 +17,18 @@ function _M.listRpc(agent, data)
     local role = agent.role
     local msg = MsgPack.unpack(data)
     local typ = msg.typ
-    local coin = msg.coin
+    local id = msg.id
     local capsules = {}
     if typ == 1 then
-        local ret = skynet.call(agent.capsule_serv, "lua", "list", coin)
+        local ret = skynet.call(agent.capsule_serv, "lua", "list", id)
         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)
+        local ret = role:getCapsuleList(id)
         if next(ret) then
             for k, v in pairs(ret) do
                 capsules[k] = v
@@ -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
@@ -93,39 +93,160 @@ function _M.drawRpc(agent, 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 full = msg.full or 0-- 0=单次，1=十连抽 2=全收
     local cares = msg.cares
-    local ret, reward, change, rewardByGoods, capsule
+    local ret, token,  change, drawReward, capsule
+
+    --检查库存
+    if typ == 1 then
+        ret, token = skynet.call(agent.capsule_serv, "lua", "goods_stock", capsuleId)
+    else
+        ret, token = role:goodStock(capsuleId)
+    end
+    if ret == 0 then skynet.error("零库存 " .. capsuleId) return 0 end
+
+    --检查余额
+    if not next(token) then skynet.error("代币未配置 " .. capsuleId) return 1 end
+    local cost, drawsNum = {}, 0
+    if full == 0 then
+        drawsNum = 1
+    elseif full == 1 then
+        if ret < 10 then
+            drawsNum = ret
+        else
+            drawsNum = 10
+        end
+    elseif full == 2 then
+        drawsNum = ret
+    end
+    cost[token[1]] = drawsNum * token[2]
+
+    if not role:checkItemEnough(cost) then return 2 end
+    role:costItems(cost, {log = {desc = "CapsuleCoinCost", int1 = token[1], int2 = cost[token[1]]}})
+
+    --开始抽奖
     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
+
+    if ret == 5 then
+        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack({change = drawReward, capsule = capsule}))
+        return true
     end
-    if ret < 4 then
+
+    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
+    return true
+end
+
+function _M.getDataRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local capsuleId = msg.capsule_id
+    local typ = msg.typ --0=独享，1= 公开
+    local roleId = role:getProperty("id")
+
+    local capsule
+    if typ == 1 then
+        capsule = skynet.call(agent.capsule_serv, "lua", "capsule_data", roleId,  capsuleId)
+    else
+        capsule = role:getCapsuleData(roleId, capsuleId)
+    end
+    if not capsule then return 1 end
+
+    SendPacket(actionCodes.Capsule_getDataRpc, MsgPack.pack({capsule = capsule}))
+    return true
+
+end
+
+function _M.convertCapsuleRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local coin = msg.coin
+    local count = msg.count or 1
+
+    local cost, convert = {}
+    for k, v in pairs(globalCsv.ichibankuji_buy_cost)do
+        if k == coin then
+            convert = v:toArray(true, "=")
+            break
+        end
+    end
+    cost[convert[1]] = convert[2] * count
+    if not role:checkItemEnough(cost) then return 1 end
+    role:costItems(cost, {log = {desc = "CapsuleConvert", int1 = convert[1], int2 = cost[convert[1]]}})
+
+
+    local reward, change = role:award({[coin]= count}, {log = {desc = "CapsuleConvert"}})
+    SendPacket(actionCodes.Capsule_convertCapsuleRpc, MsgPack.pack(role:packReward(reward, change)))
+    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= 公开
-    if ret == 4 then
-        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack(reward))
+    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")
-    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}))
+    local ret
+    if typ == 1 then
+        ret = skynet.call(agent.capsule_serv, "lua", "get_special_nty", roleId, capsuleId)
     else
-        return 5
+        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.switchRoomRpc(agent, data)
+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 = skynet.call(agent.capsule_serv, "lua", "switch_room", roleId)
-    SendPacket(actionCodes.Capsule_switchRoomRpc, MsgPack.pack(ret))
+    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
@@ -9,7 +9,7 @@ function _M.clientRequest(agent, data)
 		SendPacket(actionCodes.Gm_receiveResponse, bin)
 		return true
 	end
-	local ret = action(role, msg)
+	local ret = action(role, msg, agent.capsule_serv)
 	bin = MsgPack.pack({ cmd = ret })
 	SendPacket(actionCodes.Gm_receiveResponse, bin)
 	return true
@@ -1075,4 +1075,15 @@ function _M.clear_sea(role, pms)
 	return "成功"
 end
+table.insert(helpDes, {"重置扭蛋机", "reset_capsule", "typ"})
+function _M.reset_capsule(role, pms, capsule_serv)
+	local typ = tonumber(pms.pm1)
+	if typ == 1 then
+		skynet.call(capsule_serv, "lua", "reset")
+	else
+		role:resetCapsule()
+	end
+    return "成功"
+end
+
 return _M
 \ No newline at end of file
@@ -143,7 +143,7 @@ function _M.gm_action(query)
 	role:startActionUcode()
 	local status = gmFuncs[query.cmd](role, query)
 	role:endActionUcode()
-    role:update()
+    role:saveRoleData()
 	return status
 end
@@ -174,6 +174,7 @@ function _M.pay_action(query)
 	role:startActionUcode()
 	local status = gmFuncs[query.cmd](role, query)
 	role:endActionUcode()
+    role:saveRoleData()
 	return status
 end
@@ -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
@@ -1710,7 +1712,7 @@ function _M.setBgRpc(agent, data)
 	return true
 end
-function _M.itemExchangeRpc(agent, data)
+function _M.itemConvertMonthCardRpc(agent, data)
     local role = agent.role
 	local msg = MsgPack.unpack(data)
     local itemId = msg.item_id
@@ -1738,7 +1740,7 @@ function _M.itemExchangeRpc(agent, data)
 		end
 	end
-	SendPacket(actionCodes.Role_itemExchangeRpc, MsgPack.pack(role:packReward(reward)))
+	SendPacket(actionCodes.Role_itemConvertMonthCardRpc, MsgPack.pack(role:packReward(reward)))
     return status
 end
@@ -267,7 +267,7 @@ function _M.shopRpc(agent, data)
 	local shopCsv = {}
 	local dataSet = csvdb["shop_normalCsv"]
 	for _, datat in pairs(dataSet) do
-		if datat.shop == 5 then
+		if datat.shop == 4 then
 			shopCsv[datat.id] = datat
 		end
 	end
@@ -53,6 +53,19 @@ local function signPms(params, secret_key)
 	return md5.sumhexa(urlCode .. secret_key):lower()
 end
+local function signDyhPms(params, secret_key)
+    local keys = table_keys(params)
+    table.sort(keys)
+    local str2Sign = ""
+    for index, key in ipairs(keys) do
+        if str2Sign ~= "" then
+            str2Sign = str2Sign .. '&'
+        end
+        str2Sign = str2Sign .. string.format("%s=%s", key, params[key])
+    end
+	return md5.sumhexa(str2Sign .. secret_key):lower()
+end
+
 -- bili android 充值 入口
 function _M.biliAndroidRechargeRpc(agent, data)
 	local role = agent.role
@@ -227,7 +240,7 @@ function _M.iosRechargeRpc(agent, data)
 	--创建订单号
 	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
 	-- 签名
-	local secret_key = "1916d62251dd4a8aa5e452121eefc9a1"
+	local secret_key = "2b2036e1f44640a59168c92462714870"
 	local need = {
 		out_trade_no = partnerOrderId,
 		money = dataSet.rmb * 100,
@@ -235,7 +248,7 @@ function _M.iosRechargeRpc(agent, data)
 		product_id = dataSet.iap_product_id,
 		notify_url = msg.notifyUrl
 	}
-	local sign = signPms(need, secret_key)
+	local sign = signDyhPms(need, secret_key)
 	SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
 	return true
@@ -316,7 +329,7 @@ function _M.shopBuyRpc(agent , data)
 		role.storeData:updateProperty({field = "buyR", value = buyRecord})
         limitStr = string.format("%s/%s", buyRecord[id], dataSet.limit)
 	end
-	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, cint1= dataSet.shop}})
+	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, long1= dataSet.shop}})
 	local gift = {}
 	for _id, _count in pairs(dataSet.gift:toNumMap()) do
@@ -284,7 +284,7 @@ function CMD.close()
 	local role = agentInfo.role
 	if not role then return end
-	skynet.call(agent.capsule_serv, "lua", "exit", role:getProperty("id"))
+	skynet.call(agentInfo.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()
-Subproject commit 4d894270d4aeb6352a29dfd3a8686cbaea5b427c
+Subproject commit a77261549372a508e132953dacc6398ba793dcc1
@@ -497,6 +497,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
 		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("HeroStartSum", {})
 		role:checkTaskEnter("RuneQualityCollect", {})
 	end,
@@ -565,6 +566,7 @@ activityFunc[Activity.ActivityType.BattleCommandTask] = {
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
 		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("HeroStartSum", {})
 		role:checkTaskEnter("RuneQualityCollect", {})
 	end,
@@ -669,6 +671,7 @@ activityFunc[Activity.ActivityType.NewUserTask] = {
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
 		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("HeroStartSum", {})
 		role:checkTaskEnter("RuneQualityCollect", {})
 	end,
@@ -36,6 +36,7 @@ Capsule.schema = {
     name = {"string"},
     typ = {"number", 1}, -- 1=共享，2=独享
     coin = {"number", 0}, --货币代号
+    token = {"table", {}}, --抽一次，货币=消耗
     register = {"table", {}}, --人数 {["id"]=0}, 0 围观， 1 已报名
     record = {"table", {}}, --抽取记录  列表
     recordByRole = {"table", {}}, -- 抽取记录，hash， {roleid=record}
@@ -43,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}, --抽完时间
@@ -56,6 +57,7 @@ function Capsule:getResetFields()
         room = self:getProperty("room"),
         typ = self:getProperty("typ"),
         coin = 0,
+        token = {},
         register = {},
         record = {},
         recordByRole = {},
@@ -132,7 +134,8 @@ function Capsule:init()
     end
     --货币类型
     local coin = ichibankuji["token"]:toArray(true, "=")
-    self:setProperties({coin = coin[1] or 0, hideTime = ichibankuji.hide_time, goods = goods, specials = specials, incentive = incentive})
+    self:setProperties({coin = coin[1] or 0, token = coin, hideTime = ichibankuji.hide_time, goods = goods, specials = specials, incentive = incentive})
+
 end
 function Capsule:isShow()
@@ -142,6 +145,80 @@ function Capsule:isShow()
     return true
 end
+function Capsule:reset2TimeOut(curTime, now)
+    now = now or skynet.timex()
+    local interval
+    if now >= curTime then
+        self:init()
+        self:create()
+    else
+        interval = curTime - now
+    end
+    interval = (interval)* 100
+    skynet.timeout(interval, handler(self,self.reset3TimeOut)(curTime))
+end
+
+function Capsule:reset3TimeOut(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)* 100
+    skynet.timeout(interval, handler(self,self.reset3TimeOut))
+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)* 100
+    skynet.timeout(interval, handler(self,self.reset4TimeOut))
+end
+
+function Capsule:checkTime(reset, now)
+    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
+        --self:reset2TimeOut(drawEndTime + resetArr[2], now)
+    elseif resetArr[1] == 3 then
+        local cur4Time = specTime({hour = 4},now)
+        if now == cur4Time then return true end
+        --self:reset3TimeOut(cur4Time, now)
+    elseif resetArr[1] == 4 then
+        if now == resetArr[2] then return true end
+        --self:reset4TimeOut(resetArr[2], now)
+    end
+
+    return false
+end
+
 function Capsule:refreshing(now)
     local id = self:getProperty("id")
     local room = self:getProperty("room")
@@ -151,30 +228,13 @@ function Capsule:refreshing(now)
     if reset == "0" then
         return false
     elseif reset == "1" then
-        if self:getProperty("resetTimes") == 1 then
+        if self:getProperty("resetTimes") == 0 then
+            self:setProperty("resetTime", 1)
             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
+        return self:checkTime(reset, now)
     end
     return false
@@ -233,11 +293,11 @@ function Capsule:confirmed(cares)
     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
+                change[k] = {typ=1, count = goods[k].amount}
             end
         else
             if specials[k] and specials[k].amount ~= v.count then
-                change[k] = specials[k].amount
+                change[k] = {typ=1, count = specials[k].amount}
             end
         end
     end
@@ -271,7 +331,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")
@@ -282,19 +342,9 @@ local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
             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
+            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
@@ -302,13 +352,28 @@ local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
     return rewardByRole, count
 end
-function Capsule:getTop(record)
+
+local rewardToRecordFunc = function(specialsRecord, recordAmount, rewardByRole)
+    if not specialsRecord[recordAmount] then
+        specialsRecord[recordAmount] = rewardByRole
+    else
+        table.insert(specialsRecord[recordAmount], rewardByRole)
+    end
+end
+
+local function getRecordAmount(record)
+     return #record
+end
+
+
+function Capsule:getTop(record, recordAmount,now)
     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
+    if recordAmount < special["np"] then return  nil end
+
     local topRecord = {}
     local count = special["np"]
     for _, v in ipairs(record) do
@@ -330,32 +395,33 @@ function Capsule:getTop(record)
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP)
+    local rewardByRole, count = getSpecialReward(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP,now)
     special["amount"] = count
     specials[spKey] = special
-    specialsRecord[SpecialType.TOP] = rewardByRole
+
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
+
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
 --TODO
-function Capsule:getCore(record)
+function Capsule:getCore(record, recordAmount,now)
     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 count = special["np"]
+    if count > recordAmount then return nil end
-    local left = math.ceil((np - #record)/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
@@ -372,34 +438,32 @@ function Capsule:getCore(record)
             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}
+                roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
             end
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.CORE)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.CORE,now)
     special["amount"] = count
     specials[spKey] = special
-    specialsRecord[SpecialType.CORE] = rewardByRole
+
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getLast(record)
+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
@@ -416,90 +480,85 @@ function Capsule:getLast(record)
         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}
+            roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.LAST)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
     special["amount"] = count
     specials[spKey] = special
-    specialsRecord[SpecialType.LAST] = rewardByRole
+
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getJoker(record)
+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
             roleRecord[v.roleId]  = {amount = v.amount }
         else
-            roleRecord[v.roleId] = {amount = (roleRecord[v.rol_id]["amount"] or 0) + v.amount}
+            roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.JOKER)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
     special["amount"] = count
     specials[spKey] = special
-    specialsRecord[SpecialType.JOKER] = rewardByRole
+
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getKing(record)
+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.rol_id]["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"], SpecialType.KING)
     special["amount"] = count
     specials[spKey] = special
-    specialsRecord[SpecialType.KING] = rewardByRole
+
+    rewardToRecordFunc(specialsRecord, recordAmount, 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)
+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 {}
@@ -507,23 +566,24 @@ function Capsule:checkSpecialReward( now)
     if not next(record) then return nil end
     table.sort(record, function(a, b) return a.create_time < b.create_time  end )
+    local recordAmount = getRecordAmount(record)
-    local notify = self:getTop(record) or {}
+    local notify = self:getTop(record, recordAmount,now) or {}
-    local coreReward = self:getCore(record)
-    rewardToNtyFunc(notify, coreReward)
+    if goodsAmount == 0 then
+        local coreReward = self:getCore(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, coreReward)
-    local lastReward = self:getLast(record)
-    rewardToNtyFunc(notify, lastReward)
+        local lastReward = self:getLast(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, lastReward)
-    local jokerReward = self:getJoker(record)
-    rewardToNtyFunc(notify, jokerReward)
+        local jokerReward = self:getJoker(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, jokerReward)
-    local kingReward = self:getKing(record)
-    rewardToNtyFunc(notify, kingReward)
+        local kingReward = self:getKing(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, kingReward)
+    end
-    --广播出去TODO
-    --rpcRole(roleId, "paySpecialReward", RewardTYpe.JOKER, jokerReward.award)
     return notify
 end
@@ -561,24 +621,25 @@ function Capsule:checkIncentive(roleId, name, now)
         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
+        if count > 0 then
+            local tmpCount = count * incentive["amount"]["np"]
+            notify["amount"] = {name = name, roleId= roleId, 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
     end
@@ -590,11 +651,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)
-    return notify
+    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)
@@ -602,6 +696,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 {}
@@ -611,98 +707,106 @@ 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
         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 good_id then break end
-                --记录角色的抽奖记录 计算激励奖需要用到
-                if not roleRecord[good_id] then
-                    roleRecord[good_id] = tmpNotify
-                else
-                    roleRecord[good_id].amount = roleRecord[good_id].amount + 1
-                end
+        local good = goods[good_id] or {}
+        if good and good.amount > 0 then
+            good.amount = good.amount - 1
+
+            --插入rank
+            rankRole = rankRole + 1
-                good.weight = good.weight - csvdb["ichibankuji_goodsCsv"][goods_id][good.id].weight
-                count = count - 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 goodsByUsual[good_id] then
+                goodsByUsual[good_id] = tmpNotify
+            else
+                goodsByUsual[good_id].amount = goodsByUsual[good_id].amount + 1
             end
-        end
-    end
-    recordByRole[roleId] = roleRecord
-    self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
+            --记录角色的抽奖记录 计算激励奖需要用到
+            if not roleRecord[good_id] then
+                roleRecord[good_id] = tmpNotify
+            else
+                roleRecord[good_id].amount = roleRecord[good_id].amount + 1
+            end
-    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
+            good.weight = good.weight - csvdb["ichibankuji_goodsCsv"][goods_id][good.id].weight
+            count = count - 1
         end
+
     end
-    local speciNotify = self:checkSpecialReward(now)
-    rewardToNtyFunc(notify, speciNotify)
+    --奖励池重新赋值
+    rank[roleId] = rankRole
+    recordByRole[roleId] = roleRecord
+    self:setProperties({recordByRole = recordByRole, record = record, goods = goods, rank = rank})
-    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)
+    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)
+
+    local drawReward = {}
+    drawReward["reward"] = reward
+    drawReward["usual"] = goodsByUsual
+    drawReward["specials"] = goodsBySpecial
+    if next(goodsByIncentive) then drawReward["incentive"] = goodsByIncentive end
+    if next(specialByRole) then drawReward["special"] = specialByRole end
+    return drawReward
 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 = {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)
+            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
+                table.insert(record, {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = 1, quality = good.quality, create_time = now})
+            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
             --记录角色的抽奖记录
             if not roleRecord[good_id] then
-                roleRecord[good_id] = notify
+                roleRecord[good_id] = tmpNotify
             else
                 roleRecord[good_id].amount = roleRecord[good_id].amount + good.amount
             end
@@ -711,34 +815,32 @@ function Capsule:drawAll(roleId)
         end
     end
+    rank[roleId] = rankRole
     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
+    self:setProperties({recordByRole = recordByRole, record = record, goods = goods, rank = rank})
-    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)
+
+    local drawReward = {}
+    drawReward["reward"] = reward
+    drawReward["usual"] = goodsByUsual
+    drawReward["specials"] = goodsBySpecial
+    if next(goodsByIncentive) then drawReward["incentive"] = goodsByIncentive end
+    if next(specialByRole) then drawReward["special"] = specialByRole end
+    return drawReward
 end
 --@param
@@ -749,27 +851,97 @@ end
 ]]--
 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 self:isRegister(roleId) == false then return 4 end
         --关注的奖品的数量发生了变化
         if cares then
             local change = self:confirmed(cares)
-            if next(change) then return 4, change end
+            if next(change) then return 5, change end
         end
     end
     if full == 0 then
-        return 5, self:drawByCount(roleId, 1)
+        return 6, self:drawByCount(roleId, 1)
     elseif full == 1 then
-        return 5, self:drawByCount(roleId, 10)
+        return 6, self:drawByCount(roleId, 10)
     elseif full == 2 then
-        return 5, self:drawAll(roleId)
+        return 6, self:drawAll(roleId)
     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:getRoleProgress(roleId)
+    local recordByRole = self:getProperty("recordByRole") or {}
+    local roleRecord = recordByRole[roleId] or {}
+    local amount = 0
+    for _, v in pairs(roleRecord) do
+        v.calculated = v.calculated or 0
+        if v.calculated ~= v.amount then
+            amount = amount + (v.amount - v.calculated)
+        end
+    end
+    return amount
+end
 function Capsule:data(roleId)
     return {
@@ -780,12 +952,13 @@ 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"),
         incentive = self:getProperty("incentive"),
         specialsRecord= self:getProperty("specialsRecord"),
+        roleProgress = self:getRoleProgress(roleId),
     }
 end
@@ -167,6 +167,7 @@ RoleCross.bind = function (Role)
 				})
 				self:checkTaskEnter("Wake", {heroType = heroId, wakeL = initData.heros.wakeL})
 				self:checkTaskEnter("WakeCG", {heroType = heroId})
+				self:checkTaskEnter("WakeCGSum", {count = 1})
 				self:checkTaskEnter("HeroTalent", {heroType = heroId, alv = aheadLevel})
 			end
@@ -210,10 +211,18 @@ 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"
+	function Role:paySpecialReward(roleId, notify)
+		if notify and next(notify) then
+			local reward = {}
+			for key, val in pairs(notify) do
+				for id, count in pairs(val.award:toNumMap()) do
+					reward[id] = (reward[id] or 0) + count
+				end
+
+			end
+			self:award(reward,  {log = {desc = "CapsuleReward", int1=roleId}})
+			SendPacket(actionCodes.Capsule_notifyChange, MsgPack.pack({special = notify}))
+		end
 	end
 end
@@ -376,9 +385,19 @@ 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}})
+function CMD.paySpecialReward(roleId, notify)
+	if notify and next(notify) then
+		local reward = {}
+		for key, val in pairs(notify) do
+			for id, count in pairs(val.award:toNumMap()) do
+				reward[id] = (reward[id] or 0) + count
+			end
+
+		end
+		local role = require("models.Role").new({key = string.format("%s",roleId), id = roleId})
+		role:award(reward,  {log = {desc = "CapsuleReward", int1=roleId}})
+	end
+
 end
 RoleCross.handle = function(cmd, roleId, ...)
@@ -161,7 +161,8 @@ local ItemReason = {
 	returner = 1410, -- 回归者奖励
 	CapsuleReward = 1411, --扭蛋机奖励
-	specialsReward = 1412, --特殊赏
+	CapsuleConvert = 1412, --扭蛋机 消耗票 兑换
+	CapsuleCoinCost = 1413, --抽扭蛋机消耗
 }
@@ -32,6 +32,8 @@ function RolePlugin.bind(Role)
 	function Role:onOfflineEvent()
 		-- 设置最新的登录时间
 		self:setProperty("ltime", skynet.timex())
+
+        self:saveRoleData()
 	end
 	local function checkItemCount(self, itemId, count)
@@ -212,6 +214,8 @@ function RolePlugin.bind(Role)
 			end
 		end
 		if not next(allChange) then allChange = nil end
+        -- 加道具及时刷新数据
+        self:update()
 		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
 	end
@@ -426,8 +430,15 @@ function RolePlugin.bind(Role)
 				return
 			end
 		end
+
+		if itemCountT[ItemId.Jade] then --扣除
+			pms.itemId = ItemId.Jade
+			pms.count = - itemCountT[ItemId.Jade]
+			self:costJade(pms)
+		end
+
 		for itemId, count in pairs(itemCountT) do
-			if itemId ~= ItemId.Diamond then
+			if itemId ~= ItemId.Diamond and itemId ~= ItemId.Jade then
 				pms.itemId = itemId
 				pms.count = - count
 				self:addItem(pms)
@@ -566,6 +577,11 @@ function RolePlugin.bind(Role)
 		return true
 	end
+	function Role:costJade(param)
+        self:addItem(param)
+		self:checkTaskEnter("CostJade", {count = - param.count})
+	end
+
 	function Role:increBy(field, val)
 		local roleIncre = self:getProperty("roleIncre")
 		local curId = roleIncre[field] or 0
@@ -592,6 +608,7 @@ function RolePlugin.bind(Role)
 		}
 		if heroInfo.wakeL == 3 then
 			self:checkTaskEnter("WakeCG", {heroType = heroType})
+			self:checkTaskEnter("WakeCGSum", {count = 1})
 		end
 		local newHero = require("models.Hero").new(heroInfo)
 		newHero:create()
@@ -2037,10 +2054,10 @@ function RolePlugin.bind(Role)
     local SAVE_DATA_INTERVAL = 3
 	function Role:saveRoleData(now)
-        if now - self._lastSaveTs < SAVE_DATA_INTERVAL then
+        if now and (now - self._lastSaveTs < SAVE_DATA_INTERVAL) then
             return
         end
-        self._lastSaveTs = now
+        self._lastSaveTs = now or skynet.timex()
 		self:update()
 		local objs = {self.activity, self.dailyData, self.dinerData, self.storeData, self.roleIncre}
 		for _, info in ipairs(objs) do
@@ -2090,7 +2107,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
@@ -2437,6 +2454,11 @@ function RolePlugin.bind(Role)
 			end
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
+
+            --增加购买记录
+			local buyRecord = self.storeData:getProperty("buyR") or {}
+			buyRecord[id] = (buyRecord[id] or 0) + 1
+			self.storeData:updateProperty({field = "buyR", value = buyRecord})
 		else
 			skynet.error("[recharge] invalid recharge shop type " .. id)
 			return 3
@@ -3153,10 +3175,10 @@ function RolePlugin.bind(Role)
 		return itemRandomOccupy
 	end
-    function Role:getCapsuleList(coin)
+    function Role:getCapsuleList(id)
 		local capsules = {}
 		for k, v in pairs(self.capsules) do
-			if v:getProperty("coin") == coin then
+			if v:getProperty("id") == id 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
@@ -3165,17 +3187,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 1
+        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)
@@ -3186,6 +3211,58 @@ function RolePlugin.bind(Role)
 			end
 		end
 	end
+
+	function Role:goodStock(capsuleId)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return 0 end
+
+		return capsule:getGoodsAmount(),  capsule:getProperty("token")
+	end
+
+	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()
+		local roleId = self:getProperty("id")
+		local res = redisproxy:smembers(CAPSULE_ID_ROLE:format(roleId)) or {}
+		for _, key in pairs(res) do
+			redisproxy:del(CAPSULE_ROLE:format(roleId, tonumber(key)))
+			redisproxy:srem(CAPSULE_ID_ROLE, key)
+		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
+
+	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
@@ -17,6 +17,9 @@ local TaskType = {
 	HeroStarCollect = 12,		-- 英雄星级收集进度
 	DrawHeroNotFriend = 13,		-- 非友情招募		-- count
 	DrawHeroLimitPack = 14,		-- 抽卡限时礼貌		-- count
+    HeroStartSum = 15, 			-- 英雄星级总数
+	WakeCGSum = 16, 			-- 累计解锁xx张CG
+
 	--装备相关
 	AddEquip = 101,				-- 获得装备			- equipId	rarity
@@ -112,6 +115,7 @@ local TaskType = {
 	ActBattlePass = 911,		-- 活动关卡通关		-- chapterId
 	Appoint = 912, 				-- 触发限时礼包，指定id
 	Rename = 913,				-- 重命名
+    CostJade = 914, 			-- 消耗虹光玉
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -271,6 +275,11 @@ local StoreListener = {
 		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
 		[TaskType.DrawHeroLimitPack] = {{TriggerEventType.DrawHeroCnt, f("count")}},
 		[TaskType.Appoint] = {{TriggerEventType.Appoint, f("id")}},
+		[TaskType.SignIn] = {{TriggerEventType.SignIn, 1}},
+		[TaskType.DrawHero] = {{TriggerEventType.DrawHero, f("count")}},
+		[TaskType.FoodSell]= {{TriggerEventType.FoodSell, f("count")}},
+		[TaskType.RuneUp] = {{TriggerEventType.RuneUp, 1}},
+		[TaskType.CostDiamond] = {{TriggerEventType.CostDiamond, f("count")}},
 	}
 }
@@ -318,6 +327,9 @@ local CalendaTaskListener = {
 		[TaskType.AdvKill] = {{39, 1, f("chapterId")}},
 		[TaskType.ActBattlePass] = {{40, 3, f("chapterId")}},
 		[TaskType.AdvPass] = {{41, 3, f("id")}},
+		[TaskType.CostJade] = {{43, 1, f("count")}},
+		[TaskType.HeroStartSum] = {{44, 3}},
+		[TaskType.WakeCGSum] = {{45, 1, f("count")}},
 	}
 }
@@ -738,7 +750,7 @@ function RoleTask.bind(Role)
 									for _,uid in pairs(hero:getRunes()) do
 										if uid > 0 then
 											local runeData = self.runeBag[uid]
-											if runeData then 
+											if runeData then
 												local csvData = csvdb["runeCsv"][runeData:getProperty("type")][runeData:getProperty("id")]
 												if csvData and cfg.condition2 <= csvData.rarity then
@@ -758,9 +770,9 @@ function RoleTask.bind(Role)
 								end
 							elseif cfg.type == 15 then -- 通关关卡
 								if (calTask[id] or 0) == 0 then
-                                    if self:checkHangPass(cfg.condition2) then
+									if self:checkHangPass(cfg.condition2) then
 										calTask[id] = 1
-                                    end
+									end
 									--local hangPass = self:getProperty("hangPass")
 									--local diff = math.floor(cfg.condition2 / 10000)
 									--if (hangPass[diff] or 0) >= cfg.condition2 then
@@ -791,7 +803,7 @@ function RoleTask.bind(Role)
 							elseif cfg.type == 37 then -- 拾荒使用道具
 								if cfg.condition2 == param1 then
 									calTask[id] = (calTask[id] or 0) + (param2 or 0)
-								end	
+								end
 							elseif cfg.type == 38 then	-- 和指定建筑交互
 								local condArr = cfg.condition3:toArray(true, "=")
 								for i = 0, #condArr do
@@ -820,6 +832,14 @@ function RoleTask.bind(Role)
 								if cfg.condition2 <= param1 and param2 == 1 then
 									calTask[id] = (calTask[id] or 0) + 1
 								end
+							elseif cfg.type == 44 then --玩家拥有拾荒者总星级达到xxx
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									count = count + hero:getProperty("wakeL")
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
 							end
 						end
 					end
@@ -55,6 +55,7 @@ Store.schema = {
     dailyShop = {"table", {}},
     weekShop = {"table", {}},
+    dayLimitInfo = {"table", {}},       -- {[id]={count=0, trigger=0}}
 }
 function Store:updateProperty(params)
@@ -80,6 +81,7 @@ function Store:onCrossDay()
     --self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
     --self:checkPaySignReward()
+    self:resetDayLimitPackTriggerCount()
     --刷新商店
     self:flushDailyShop()
@@ -219,6 +221,15 @@ function Store:deleteExpireLimitGoods()
     self:updateProperty({field = "limitTPack", value = limitGoodsList, notNotify = true})
 end
+-- 每日充值循环限时礼包的触发次数
+function Store:resetDayLimitPackTriggerCount()
+    local dayLimitInfo = self:getProperty("dayLimitInfo")
+    for k, v in pairs(dayLimitInfo) do
+        v['trigger'] = nil
+    end
+    self:updateProperty({field = "dayLimitInfo", value = dayLimitInfo, notNotify = true})
+end
+
 -- 发送月卡邮件
 function Store:sendMonthCardEmail()
     local timeNow = skynet.timex()
@@ -474,7 +485,7 @@ function Store:onBuyCard(type, duration, id, actid)
         self:updateProperty({field = "bpInfo", value = bpInfo})
     elseif type == CardType.ActBattleCommandCard then
         if not self.owner.activity:isOpenById(actid, "ActShopGoods") then
-            return
+            return nil
         end
         local actCfg = csvdb["activity_ctrlCsv"][actid]
         if not actCfg then return end
@@ -486,6 +497,10 @@ function Store:onBuyCard(type, duration, id, actid)
         end
         self.owner:mylog("act_action", {desc="buyBc", int1=id, int2=actData["lvl"] or 0})
         self.owner.activity:updateActData("BattleCommand", actData)
+        local rechargeData = csvdb["shop_rechargeCsv"][id]
+        if rechargeData then
+            return self.owner:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
+        end
     end
     return nil, nil
 end
@@ -587,41 +602,40 @@ function Store:OnTriggerLimitTimePack(eventType, param)
     local limitPack = self:getProperty("limitTPack")
     --local payRecord = self:getProperty("payR")
     local timeNow = skynet.timex()
-    --local find = false
-    -- 有未过期的限时礼包不再推送
-    --for k, v in pairs(limitPack) do
-    --    if v > timeNow and not payRecord[k] then
-    --        find = true
-    --        break
-    --    end
-    --end
-    --if find == true then
-    --    return
-    --end
-    --local hangPass = self.owner:getProperty("hangPass")
-    --local triggerRecord = self:getProperty("packTrigger")
-    --local result = {}
-    --local maxDiff = 0
-    -- 取满足限时礼包关卡要求的对应数据
-    --for diff, maxCarbonId in pairs(hangPass) do
-    --    for id, cfg in pairs(csvdb["shop_packCsv"]) do
-    --        local range = cfg.showRange:toArray(true, "=")
-    --        local beginRange = range[1] or 0
-    --        local endRange = range[2] or 0
-    --        if maxCarbonId > beginRange and maxCarbonId <= endRange and cfg.type == eventType then
-    --            result[diff] = cfg
-    --            maxDiff = math.max(maxDiff, diff)
-    --            break
-    --        end
-    --    end
-    --end
+ 
     local config = nil
     for id, cfg in pairs(csvdb["shop_packCsv"]) do
-        if cfg.type == eventType and cfg.condition == param then
+        if cfg.type == eventType and (cfg.condition == param or cfg.isLoop ~= 0) then
             config = cfg
+            break
         end
     end
     if config ~= nil then
+        -- 每日循环弹窗
+        local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1}
+        if typeMap[eventType] then
+            local dayInfo = self:getProperty("dayLimitInfo")
+            local info = dayInfo[eventType] or {} 
+            local count = (info["count"] or 0) + param
+            local triggerCount = info["trigger"] or 0
+            local flag = nil
+            if count >= config.condition then
+                if triggerCount < config.triggerLimit then
+                    info["trigger"] = triggerCount + 1
+                    info["count"] = 0
+                    flag = true
+                else
+                    info["count"] = config.condition - 1
+                end
+            else
+                info["count"] = count
+            end
+            dayInfo[eventType] = info
+            self:updateProperty({field = "dayLimitInfo", value = dayInfo})
+            if not flag then
+                return
+            end
+        end
         local rechargeCfg = csvdb["shop_normalCsv"][config.packId]
         if rechargeCfg then
             limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
@@ -629,14 +643,21 @@ function Store:OnTriggerLimitTimePack(eventType, param)
                 gift_id = rechargeCfg.id, --礼包ID
                 gift_name = rechargeCfg.descId,   --礼包名称
             })
-            -- 每日抽卡限时礼包 触发重置
-            if eventType == TriggerEventType.DrawHeroCnt then
-                local payR = self:getProperty("buyR")
+            if config.isLoop ~= 0 then
+                local payR = self:getProperty("payR")
                 if payR[rechargeCfg.id] then
                     payR[rechargeCfg.id] = nil
-                    self:updateProperty({field = "buyR", value = payR})
+                    self:updateProperty({field = "payR", value = payR})
                 end
             end
+            -- 每日抽卡限时礼包 触发重置
+            --if eventType == TriggerEventType.DrawHeroCnt then
+            --    local payR = self:getProperty("buyR")
+            --    if payR[rechargeCfg.id] then
+            --        payR[rechargeCfg.id] = nil
+            --        self:updateProperty({field = "buyR", value = payR})
+            --    end
+            --end
             self:updateProperty({field = "limitTPack", value = limitPack})
         end
     end
@@ -141,10 +141,11 @@ function _M:check_agent_status()
 		end
 	end
+	local count = table_nums(self.u2f)
+    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
@@ -16,27 +16,44 @@ NotifyChangeType = {
     EXIT = 2,
     DRAW = 3,
     SPECIAL = 4,
-    INCENTIVE = 5,
+}
+
+skynet.register_protocol {
+    name = "role",
+    id = 101,
+    pack = skynet.pack,
+    unpack = skynet.unpack,
 }
 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)
+    if agent and agent.serv then
+        if funcName == "getProperties" then
+            return true, skynet.call(agent.serv, "role", funcName, fields)
+        else
+            return true, skynet.call(agent.serv, "role", funcName, ...)
+        end
     else
-        return roleCross.handle(funcName, roleId, ...)
+        local roleCross = require("models.RoleCross")
+        if funcName == "getProperties" then
+            return false, roleCross.handle(funcName, roleId, fields)
+        else
+            return false, roleCross.handle(funcName, roleId, ...)
+        end
     end
 end
 function getNameByRoleId(roleId)
-    return rpcRole(roleId, "getProperty", "name")
+    local status, name = rpcRole(roleId, "getProperty", "name")
+    return name
 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
@@ -47,25 +64,39 @@ function broadCastCapsule(roleId, capsuleId, broadInfo)
     end
 end
-local function getCapsuleId(id, room)
-    return string.format("%d%d", id, room)
-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
+    local register = capsule:getProperty("register") or {}
+    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("add not capsule: " .. capsuleId) return end
     if next(capsule) then
         capsule:join(roleId)
-        broadCastCapsule(roleId, capsuleId, {changeType = NotifyChangeType.JOIN, roleId = roleId})
+        broadCastCapsule(roleId, capsuleId, {notifyType= NotifyChangeType.JOIN, roleId = roleId})
         return capsule:data(roleId)
     end
     print("id 不存在: ".. capsuleId)
     return nil
 end
-local function capsuleRefreshing()
+local function capsuleRefreshing(now)
     for _, v in pairs(capsules) do
-        if v:refreshing() then
+        if v:refreshing(now) then
+            print("刷新机器looooook....")
+            print(v:getProperty("id"))
+            print(v:getProperty("room"))
             v:init()
             v:create()
         end
@@ -74,8 +105,31 @@ end
 --扭蛋机刷新
 local function check_capsules()
-    pcall(capsuleRefreshing)
-    skynet.timeout(60, check_capsules)
+    local now = skynet.timex()
+    pcall(capsuleRefreshing, now)
+    skynet.timeout(100, check_capsules)
+end
+
+function CMD.reset()
+    local now = skynet.timex()
+    local res = redisproxy:smembers(CAPSULE_INFO) or {}
+    for _, key in pairs(res) do
+        redisproxy:del(CAPSULE_PUBLIC:format(key))
+        redisproxy:srem(CAPSULE_INFO, key)
+    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
+                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
 function CMD.start()
@@ -101,11 +155,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
@@ -114,10 +171,10 @@ function CMD.start()
     check_capsules()
 end
-function CMD.list(coin)
+function CMD.list(id)
     local tmpCapsules = {}
     for k, v in pairs(capsules) do
-        if v:getProperty("coin") == coin then
+        if v:getProperty("id") == id 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
@@ -135,39 +192,74 @@ 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
+        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, {changeType = NotifyChangeType.EXIT, roleId = roleId})
+                broadCastCapsule(roleId, id, {notifyType = 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)
+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, 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 1
+    drawReward["specials"] = nil
+    return ret, drawReward, capsule:data(roleId)
 end
 function CMD.register(roleId, capsuleId)
-    local capsule = capsules[capsuleId] or {}
-    if next(capsule) then
-        return capsule:register(roleId)
-    end
-    return nil
+    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]
+    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]
+    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()
@@ -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
@@ -510,6 +510,11 @@ function ModelBaseMysql:updateFields(fields)
             skynet.error("error sql:"..sql)
             skynet.error("error str:"..res["err"])
             return false
+        else
+            if (res["affected_rows"] or -1) == 0 then
+                skynet.error("affected row = 0")
+                skynet.error("error sql:"..sql)
+            end
         end
     end
     return true