Merge branch 'cn/develop' into cn/player

jiyue
2 parents e08b052f e66080dd
Showing 27 changed files with 1153 additions and 467 deletions Show diff stats
robot/robot.lua
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CapsuleAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.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/Role.lua
src/models/RoleCross.lua
src/models/RoleLog.lua
@@ -136,6 +136,18 @@ function CMD.task()
 	startUnit()
 end
+function randomName()
+    local str = "1234567890abcdefghijklmnopqrstuvwxyz"
+    local len = #str
+    local result = ""
+    for i=1,10 do
+        local idx = math.random(1, len)
+        result = result .. string.sub(str, idx, idx)
+    end
+
+    return result
+end
+
 -- 开始登录
 function CMD.start(fd, id)
 	client.fd = fd
@@ -133,7 +133,7 @@ ItemStartId = {
 --常用的物品id的枚举
 ItemId = {
 	Gold = 1,  -- 金币
-	Exp = 2,  -- 经验
+	Exp = 2,  -- 能量饮料
 	Jade = 3,  -- 虹光玉
 	PlayerExp = 4,  -- 突破材料
 	FriendPoint = 5,  -- 友情点
@@ -371,6 +371,8 @@ MailId = {
 	CBBackAward2 = 244,
 	ActivityPoolRet = 280,
 	MyCardBuy = 300,
+
+    RechargeBack = 3001,
 }
 TriggerEventType = {
@@ -383,6 +385,13 @@ TriggerEventType = {
 	AfterTs = 7, 	-- 某时间以后
 	DrawHeroCnt = 8,	-- 每日抽卡次数
 	Appoint = 0, -- 触发指定id礼包
+	SignIn = 9,	-- 签到
+    DrawHero = 10,  -- 循环抽卡
+    FoodSell = 11,  -- 循环卖菜
+    RuneUp = 12,    -- 循环强化符文
+    CostDiamond = 13,   -- 循环消耗钻石
+    BuyLimitPack = 14, --购买指定id礼包 触发
+	HeroTalent = 15, --英雄精进 触发礼包
 }
 DrawCardType = {
@@ -424,6 +433,8 @@ SystemBnousType = {
 	UpSpeedNum = 15, -- 加速次数上限增加 15=1探索加速or 2齿轮加速or 3餐厅加速=增加次数
 	ChangeBaseCount = 16, -- 每日奖励关卡挑战卡基础数量增加
 	ChangeBuyCount = 17, -- 每日奖励关卡挑战卡可购买次数增加，
+	ExtraProp = 18, -- 每次探索加速额外获得道具
+	AccountLevel = 19, -- 账号等级提升角色等级上限
 }
 -- 开箱物品类型
@@ -435,4 +446,12 @@ ItemOccupy = {
 	Spark = 5, --火花
     Other = 6,
 	CanUsed = 7, --可使用
+}
+
+-- 世界变动积分
+ItemWorldLine = {
+	RouletteCount = 1, --抽轮盘次数
+	Points = 2, --积分
+	CostDiamond = 3, --消耗钻石
+    CostJade = 4, --消耗红光玉
 }
 \ No newline at end of file
@@ -13,6 +13,8 @@ actionCodes = {
 	Gm_clientRequest = 20,
 	Gm_receiveResponse = 21,
 	Gm_helpRpc = 22,
+    Gm_clientLuaCommandNtf = 23,
+    Gm_clientUploadLuaResult = 24,
 	Role_notifyNewEvent = 100,
 	Role_queryLoginRpc = 101,
@@ -59,7 +61,9 @@ actionCodes = {
     Role_runeBuyRpc = 142,   	-- 铭文购买
     Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
     Role_setBgRpc = 144,   	-- 设置看板娘
-	Role_itemConvertMonthCardRpc = 145, -- 兑换月卡道具
+	Role_itemConvertSpecialRpc = 145, -- 兑换月卡/战令探索指令等 特殊道具
+	Role_worldLineRoulette = 146, --世界线抽轮盘
+	Role_worldLineReward = 147, -- 世界线一键领取奖励
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -225,6 +229,7 @@ actionCodes = {
 	Store_getExploreCommandRewardRpc = 563, --探索指令
 	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
 	Store_monthCardRewardRpc = 565, --每日月卡+特刊奖励
+    Store_dyhxAndroidRechargeRpc = 566, -- 东银河充值
 	Store_biliCloudRechargeRpc = 596,
 	Store_biliAndroidRechargeRpc = 597,
@@ -245,7 +250,7 @@ actionCodes = {
 	Activity_actCalendaTaskRpc = 655,
 	Activity_actPaySignRpc = 656,
 	Activity_exchangeRpc = 657,
-	Activity_gachakonRpc = 658,
+	Activity_gachakonRpc = 658, --狩猎祭 抽扭蛋机
 	Activity_hangDropRpc = 659,
 	Activity_startBattleRpc = 660,
 	Activity_endBattleRpc = 661,
@@ -263,6 +268,7 @@ actionCodes = {
 	Activity_returnerTaskRpc = 673,
 	Activity_actNewUserTaskRpc = 674,
     Activity_buyBattleTicketRpc = 675,
+	Activity_resetGachakonRpc = 676, --狩猎祭，重制扭蛋机
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -281,10 +287,12 @@ actionCodes = {
 	Capsule_drawRpc = 854, --抽扭蛋机
 	--Capsule_switchRoomRpc = 855, --切换扭蛋机房间
 	Capsule_notifyChange = 856, -- 通知信息变动
-	Capsule_payReward = 857, -- 特殊赏 奖励通知
+	Capsule_specialRewardRpc = 857, -- 获取 未领取特殊赏通知 主动
 	Capsule_exitRpc = 858, -- 退出
 	Capsule_getDataRpc = 859, --获取扭蛋机信息
-    Capsule_convertCapsuleRpc = 890, --兑换消耗票
+    Capsule_convertCapsuleRpc = 860, --兑换消耗票
+	Capsule_pageRecordRpc = 861, --抽奖记录分页查询
+	Capsule_clearSpecialNtyRpc = 862, --消除特殊赏通知
 }
 rpcResponseBegin = 10000
@@ -315,7 +315,27 @@ function _M.actBattleCommandTaskRpc(agent, data)
 	role:updateProperty({field = "bcTask", value = calTask})
-	local reward, change = role:award(taskCfg.reward, {log = {desc = "battleCommandTask"}})
+	local rechargeRecord = role.storeData:getProperty("payR") or {}
+	local recordFlag = false
+	for _, id  in ipairs(taskCfg.battlepass_id:toArray(true, "=")) do
+		if rechargeRecord[id] then
+			local cfg = csvdb["shop_rechargeCsv"][id]
+			if cfg and cfg.shop == 2 and cfg.type == CardType.ActBattleCommandCard then
+				recordFlag = true
+				break
+			end
+		end
+	end
+
+	local taskReward = {}
+	if recordFlag then
+		for k, v in pairs(taskCfg.reward:toNumMap()) do
+			taskReward[k] = (taskReward[k] or 0) + v + taskCfg.battlepass_reward
+            break
+		end
+	end
+
+	local reward, change = role:award(taskReward, {log = {desc = "battleCommandTask"}})
 	role:log("activity", {
 		activity_id = taskId, -- 活动ID（或活动指定任务的ID）
@@ -479,6 +499,20 @@ function _M.gachakonRpc(agent, data)
 	return true
 end
+function _M.resetGachakonRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+
+	if not role.activity:isOpenById(actid, "Gachakon") then return 1 end
+
+	if role.activity:isResetById(actid, "Gachakon") then return 2 end
+	role.activity:resetActDataById(actid)
+
+	SendPacket(actionCodes.Activity_resetGachakonRpc, MsgPack.pack({}))
+    return true
+end
+
 function _M.hangDropRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -605,6 +639,8 @@ function _M.startBattleRpc(agent, data)
                 end
 			end
             num = num * count
+        else
+            num = 0
 		end
 		if ticket < num then
 			return 6
@@ -643,7 +679,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 +699,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 +841,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 +1379,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 +1528,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
@@ -96,7 +96,7 @@ function _M.drawRpc(agent, data)
     local full = msg.full or 0-- 0=单次，1=十连抽 2=全收
     local cares = msg.cares
-    local ret, token, reward, change, rewardByGoods, capsule
+    local ret, token,  change, drawReward, capsule
     --检查库存
     if typ == 1 then
@@ -127,26 +127,23 @@ function _M.drawRpc(agent, data)
     --开始抽奖
     if typ == 1 then
-        ret, reward, rewardByGoods, capsule = skynet.call(agent.capsule_serv, "lua", "draw_capsule", roleId, capsuleId, full, cares)
+        ret, drawReward, capsule = skynet.call(agent.capsule_serv, "lua", "draw_capsule", roleId, capsuleId, full, cares)
     else
-        ret, reward, rewardByGoods, capsule= role:drawCapsule(capsuleId, full, cares)
+        ret, drawReward, capsule = role:drawCapsule(capsuleId, full, cares)
     end
     if ret < 5 then
         return ret
     end
-    --dump(rewardByGoods)
-    --dump(capsule)
-
     if ret == 5 then
-        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack({change = reward, capsule = capsule}))
+        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack({change = drawReward, capsule = capsule}))
         return true
     end
-    -- rewardByGoods是抽到的扭蛋信息，reward是抽扭蛋后获得的所有奖励信息。
-    if rewardByGoods and next(rewardByGoods) then
-        reward, change = role:award(reward, {log = {desc = "CapsuleReward", int1 = tonumber(capsuleId), int2 = roleId}})
-        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack({reward = rewardByGoods, capsule = capsule}))
+    if drawReward["reward"] and next(drawReward["reward"]) then
+        _, change = role:award(drawReward["reward"], {log = {desc = "CapsuleReward", int1 = tonumber(capsuleId), int2 = roleId}})
+        drawReward["capsule"] = capsule
+        SendPacket(actionCodes.Capsule_drawRpc, MsgPack.pack(drawReward))
     else
         return ret
     end
@@ -164,7 +161,7 @@ function _M.getDataRpc(agent, data)
     if typ == 1 then
         capsule = skynet.call(agent.capsule_serv, "lua", "capsule_data", roleId,  capsuleId)
     else
-        capsule = role:getCapsuleData(capsuleId)
+        capsule = role:getCapsuleData(roleId, capsuleId)
     end
     if not capsule then return 1 end
@@ -190,9 +187,67 @@ function _M.convertCapsuleRpc(agent, data)
     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"}})
+
+    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= 公开
+
+    local record
+    if typ == 1 then
+        record = skynet.call(agent.capsule_serv, "lua", "page_record", capsuleId, up, idx)
+    else
+        record = role:pageRecord(capsuleId, up, idx)
+    end
+    if not record then return 1 end
+
+    SendPacket(actionCodes.Capsule_pageRecordRpc, MsgPack.pack({record = record}))
+    return true
+end
+
+function _M.specialRewardRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local capsuleId = msg.capsule_id
+    local typ = msg.typ or 1 --0=独享，1= 公开
+    local roleId = role:getProperty("id")
+
+    local ret
+    if typ == 1 then
+        ret = skynet.call(agent.capsule_serv, "lua", "get_special_nty", roleId, capsuleId)
+    else
+        ret = role:getSpecialNotify(roleId, capsuleId)
+    end
+    if not ret or not next(ret) then return 1 end
+
+    SendPacket(actionCodes.Capsule_specialRewardRpc, MsgPack.pack({special= ret}))
+    return true
+end
+
+function _M.clearSpecialNtyRpc(agent, data)
+    local role = agent.role
+    local msg = MsgPack.unpack(data)
+    local capsuleId = msg.capsule_id
+    local typ = msg.typ --0=独享，1= 公开
+    local good_ids = msg.good_ids
+    local roleId = role:getProperty("id")
+
+    local ret
+    if typ == 1 then
+        ret = skynet.call(agent.capsule_serv, "lua", "clear_special_nty", roleId, capsuleId, good_ids)
+    end
+    if not ret or not next(ret) then return 1 end
+
+    SendPacket(actionCodes.Capsule_clearSpecialNtyRpc, MsgPack.pack({}))
+    return true
+end
+
 return _M
 \ No newline at end of file
@@ -675,6 +675,13 @@ function _M.helpRpc(agent, data)
 	return true
 end
+function _M.clientUploadLuaResult(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    role:mylog("gm_action", {desc = "upload_lua", int1 = id, key1 = msg.result})
+    return true
+end
+
 function _M.test(role, pms)
 	local id = tonum(pms.pm1, 0)
 	local actid = nil
@@ -722,6 +729,8 @@ function _M.cz(role, pms)
 		pay_time = skynet.timex(),
 		sid = sid == 1 and IOS_SID or 0,
 	})
+    -- 补发邮件
+    role:sendMail(MailId.RechargeBack)
 	role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
 	return "指令成功"
 end
@@ -1086,4 +1095,10 @@ function _M.reset_capsule(role, pms, capsule_serv)
     return "成功"
 end
+function _M.do_lua(role, pms)
+	local luaStr = pms.pm1
+    SendPacket(actionCodes.Gm_clientLuaCommandNtf, MsgPack.pack({lua = luaStr}))
+    return "成功"
+end
+
 return _M
 \ No newline at end of file
@@ -528,16 +528,20 @@ function _M.quickRpc(agent , data)
 	end
 	--宝藏加速
-	local treasureList= role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
-	if next(treasureList) then
-		for id, val in pairs(treasureList) do
-			local award  = val.award:toNumMap()
-			for k,v in pairs(award) do
-				reward[k] = (reward[k] or 0) + v
-			end
+	local treasureList = role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
+	for id, val in pairs(treasureList) do
+		local award  = val.award:toNumMap()
+		for k,v in pairs(award) do
+			reward[k] = (reward[k] or 0) + v
 		end
 	end
+	--等级 额外奖励
+	local levelReward = role:getExtraProp()
+	for k, v in pairs(levelReward or {}) do
+		reward[k] = (reward[k] or 0) + v
+	end
+
 	local change
 	reward, change = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	if reward[ItemId.Gold] then
@@ -42,10 +42,14 @@ function _M.levelUpRpc( agent, data )
 	if not role:checkItemEnough(cost) then return 3 end
 	-- 通过指定关卡后才能升级英雄等级
-	local pass = globalCsv.unit_exp_level_pass[level + 1]
-	if pass then
-		if not role:checkHangPass(pass) then return 4 end
-	end
+	--local pass = globalCsv.unit_exp_level_pass[level + 1]
+	--if pass then
+	--	if not role:checkHangPass(pass) then return 4 end
+	--end
+
+	--账号等级提升角色等级上限
+	local accountLevel = role:getAccountLevel()
+    if level >= accountLevel then return 4 end
 	role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
@@ -86,10 +90,10 @@ function _M.breakRpc( agent, data )
 	if not role:checkItemEnough(cost) then return 4 end
 	-- 通过指定关卡后才能突破英雄
-	local pass = globalCsv.unit_break_level_pass[breakL + 1]
-	if pass then
-		if not role:checkHangPass(pass) then return 4 end
-	end
+	--local pass = globalCsv.unit_break_level_pass[breakL + 1]
+	--if pass then
+	--	if not role:checkHangPass(pass) then return 4 end
+	--end
 	role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
 	local oldAttr = hero:getTotalAttrs()
@@ -147,9 +151,11 @@ function _M.wakeRpc(agent, data)
 	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "wakeL", delta = 1})
-	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel + 1})
+	curLevel = curLevel + 1
+	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
 	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
+		role:checkTaskEnter("WakeCGSum", {count = 1})
 	end
 	if curLevel >= 4 then --自动觉醒技能
@@ -173,6 +179,7 @@ function _M.wakeRpc(agent, data)
 	SendPacket(actionCodes.Hero_wakeRpc, '')
 	role:checkTaskEnter("HeroStarCollect", {})
+	role:checkTaskEnter("HeroStartSum", {})
 	return true
 end
@@ -212,7 +219,7 @@ function _M.talentRpc(agent, data)
 		talent = talent:setv(1, curLevel + 1)
 	end
 	curStage = talent:getv(0, 1)
-	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage})
+	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage, count = 1})
 	hero:updateProperty({field = "talent", value = talent})
@@ -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,36 +1712,112 @@ function _M.setBgRpc(agent, data)
 	return true
 end
-function _M.itemConvertMonthCardRpc(agent, data)
+function _M.itemConvertSpecialRpc(agent, data)
     local role = agent.role
 	local msg = MsgPack.unpack(data)
     local itemId = msg.item_id
-	local typ = msg.typ
-    local count = msg.count
-	local exchangeId = msg.change_id
-
-    if not ItemId[itemId] then return 1 end
+	local exchangeId = tonumber(msg.exchange_id)
-	if not role:checkItemEnough({[itemId] = count}) then return 2 end
-	role:costItems({[itemId] = count}, {log = {desc = "itemConvertmonthCard", int1 = count, int2 = count}})
+    local itemData = csvdb["itemCsv"][itemId]
+    if not itemData then return 1 end
 	local rechargeData = csvdb["shop_rechargeCsv"][exchangeId]
 	if not rechargeData then
 		skynet.error("[recharge] recharge id not exist", exchangeId)
-		return 3
+		return 2
 	end
-    local reward = {}
-	for i = 1, count do
-		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.id , rechargeData.activity_id)
+
+	if not role:checkItemEnough({[itemId] = 1}) then return 3 end
+
+	local reward = {}
+
+	if not role.storeData:checkRechargeRecord(rechargeData.limit, exchangeId)then
+		return 5
+	end
+
+	if rechargeData.type == CardType.ActBattleCommandCard then
+		if role.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then
+			local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
+			if tmpreward then
+				table.rewardMerge(reward, tmpreward)
+			end
+		else
+			skynet.error("not open id: ".. rechargeData.id .. "; actid: " .. rechargeData.activity_id)
+			SendPacket(actionCodes.Role_itemConvertSpecialRpc, MsgPack.pack({result = 4}))
+            return true
+		end
+	else
+		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
 		if tmpreward then
 			table.rewardMerge(reward, tmpreward)
-		else
-			return
 		end
 	end
-	SendPacket(actionCodes.Role_itemConvertMonthCardRpc, MsgPack.pack(role:packReward(reward)))
-    return status
+	role:costItems({[itemId] = 1}, {log = {desc = "itemConvertSpecial", int1 = itemId, int2 = itemData.type}})
+
+	SendPacket(actionCodes.Role_itemConvertSpecialRpc, MsgPack.pack(role:packReward(reward)))
+    return true
+end
+
+function _M.worldLineRoulette(agent, data)
+	local role = agent.role
+
+	local worldChangePoints = role:getProperty("worldChangePoints") or {}
+    local rouletteCount =  worldChangePoints[ItemWorldLine.RouletteCount] or 0
+	if rouletteCount == 0 then return 1 end
+
+	local worldline_gift_base_10, worldline_gift_base_1, worldline_gift_magnification_1, worldline_gift_magnification_0 = {}, {}, {}, {}
+	for k, v in pairs(globalCsv.worldline_gift_base_10) do
+		worldline_gift_base_10[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_base_1) do
+		worldline_gift_base_1[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_magnification_1) do
+		worldline_gift_magnification_1[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_magnification_0) do
+		worldline_gift_magnification_0[k] = {v}
+	end
+
+    local gift_base_10 = (math.randWeight(worldline_gift_base_10, 1) or 0) * 10
+	local gift_base_1 = math.randWeight(worldline_gift_base_1, 1) or 0
+
+	local gift_magnification_1 = math.randWeight(worldline_gift_magnification_1, 1) or 0
+	local gift_magnification_0 = (math.randWeight(worldline_gift_magnification_0, 1) or 0) * (0.1)
+
+	local points = math.floor((gift_base_10 + gift_base_1) * (gift_magnification_1 + gift_magnification_0))
+	worldChangePoints[ItemWorldLine.RouletteCount] = worldChangePoints[ItemWorldLine.RouletteCount] - 1
+	worldChangePoints[ItemWorldLine.Points] = worldChangePoints[ItemWorldLine.Points] + points
+    role:updateProperty({field = "worldChangePoints", value = worldChangePoints})
+
+	SendPacket(actionCodes.Role_worldLineRoulette, MsgPack.pack(worldChangePoints))
+    return true
+end
+
+function _M.worldLineReward(agent, data)
+	local role = agent.role
+    local worldLineReward = role:getProperty("worldLineReward") or {}
+	local worldChangePoints = role:getProperty("worldChangePoints") or {}
+	local points =  worldChangePoints[ItemWorldLine.Points] or 0
+
+	local reward, change = {}
+	for key, val in pairs(csvdb["worldline_rewardCsv"]) do
+		if points >= key and not worldLineReward[key] then
+			for k, v in pairs(val.award:toNumMap()) do
+				reward[k] = (reward[k] or 0) + v
+			end
+			worldLineReward[key] = 1
+		end
+	end
+
+	role:updateProperty({field = "worldLineReward", value = worldLineReward})
+
+	if next(reward) then
+		reward, change = role:award(reward,  {log = {desc = "worldLine", int1 = role:getProperty("id")}})
+	end
+	SendPacket(actionCodes.Role_worldLineReward, MsgPack.pack(role:packReward(reward, change)))
+	return true
 end
 return _M
 \ No newline at end of file
@@ -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
@@ -52,6 +52,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
@@ -226,7 +239,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,
@@ -234,12 +247,40 @@ 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
 end
+-- dyh android 充值 入口
+function _M.dyhxAndroidRechargeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local choose = msg.choose or ""
+	local dataSet = csvdb["shop_rechargeCsv"][id]
+	if not dataSet then return end
+	local roleId = role:getProperty("id")
+
+	role.ignoreHeartbeat = true
+	--创建订单号
+	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
+	-- 签名
+	local secret_key = "51ba4398c69d4d229d5402295dc38b50"
+	local need = {
+		out_trade_no = partnerOrderId,
+		money = dataSet.rmb * 100,
+		game_money = dataSet.diamond,
+		notify_url = msg.notifyUrl
+	}
+	local sign = signDyhPms(need, secret_key)
+
+	SendPacket(actionCodes.Store_dyhxAndroidRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
+	return true
+end
+
+
 function _M.purchaseOrderResult(agent, data)
 	local role = agent.role
@@ -315,7 +356,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
@@ -35,10 +35,17 @@ local function handle_timeout()
 	skynet.timeout(100, handle_timeout)
 end
+local function handle_gc()
+	if not agentInfo.open_timer then return end
+    collectgarbage("collect")
+	skynet.timeout(6000, handle_gc)
+end
+
 function start_agent_timer()
 	if agentInfo.open_timer then return end
 	agentInfo.open_timer = true
 	skynet.timeout(150, handle_timeout)
+	skynet.timeout(6000, handle_gc)
 end
 function cancel_agent_timer()
-Subproject commit 4d894270d4aeb6352a29dfd3a8686cbaea5b427c
+Subproject commit 45264603ff07db4cd2eaf8822c17f453bf5f00de
@@ -93,6 +93,8 @@ Activity.schema = {
 	act34		= {"table", {}},	-- 战令记录{unlock = 1, freeR = "", payR = "", lvl = 10, sum = 100}
 	act36 		= {"table", {}}, -- 每日活跃签到 {0=day, 1=1,2=1,3=1}
+
+	reset20 = {"number", 1}, -- 重置扭蛋机
 }
 function Activity:data()
@@ -121,6 +123,8 @@ function Activity:data()
 		act34 = self:getProperty("act34"),
 		act36 = self:getProperty("act36"),
+
+		reset20 = self:getProperty("reset20")
 	}
 end
@@ -207,6 +211,24 @@ function Activity:isOpenById(id, activityType)
 	return self._isOpen[id]
 end
+function Activity:isResetById(id, activityType)
+	activityType = checkActivityType(activityType)
+	local cfg = csvdb["activity_ctrlCsv"][id]
+	if not cfg then return false end
+	if activityType ~= 0 and cfg.showType ~= activityType then return false end
+	return self:getResetData(activityType) == 0
+end
+
+function Activity:getResetData(actType)
+	actType = checkActivityType(actType)
+	return self:getProperty("reset" .. actType)
+end
+
+function Activity:updateResetData(actType, reset)
+	actType = checkActivityType(actType)
+	self:updateProperty({field = "reset" .. actType, value = reset})
+end
+
 function Activity:getActData(actType)
 	actType = checkActivityType(actType)
 	return self:getProperty("act" .. actType)
@@ -497,6 +519,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 +588,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 +693,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,
@@ -753,8 +778,14 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 		self:updateActData(actType, {}, not notify)
 	end,
 	["crossDay"] = function(self, actType, notify)
-		self:updateActData(actType, {}, not notify)
+		self:updateResetData(actType, 1)
+		--self:updateActData(actType, {}, not notify)
 	end,
+	["reset"] = function(self, actType)
+		if self:getResetData(actType) == 0 then return end
+		self:updateResetData(actType, 0)
+		self:updateActData(actType, {})
+	end
 }
 -- 活动卡池
@@ -862,6 +893,15 @@ function Activity:refreshWeekData(notify)
 	end
 end
+function Activity:resetActDataById(actId)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
+	if activityFunc[actType] and activityFunc[actType]['reset'] then
+		activityFunc[actType]["reset"](self, actType)
+	end
+end
+
 function Activity:checkActivity(notNotify, activityType, ...)
 	if not activityType then return end
 	if not self:isOpen(activityType) then return end
@@ -44,8 +44,8 @@ Capsule.schema = {
     goods = {"table", {}}, --奖励池
     specials = {"table", {}}, --特殊赏
     incentive = {"table", {}}, --激励奖
-    incentiveRecord = {"table", {}}, --激励奖记录
-    specialsRecord= {"table", {}}, --特殊赏领取记录
+    incentiveRecord = {"table", {}}, --激励奖记录 {roleId = {}, roleId={}}
+    specialsRecord= {"table", {}}, --特殊赏领取记录 {1={},2={}} key=触发特殊赏的 抽奖次数， v=特殊赏商品 table
     resetTimes = {"number", 0}, --每日一次手动重置的机会
     hideTime = {"number", 0} , --隐藏时间
     drawEndTime = {"number", 0}, --抽完时间
@@ -145,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")
@@ -154,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
@@ -274,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")
@@ -285,19 +342,9 @@ local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
             if tmp["amount"] <= 0 then rewardRecord[roleId] = nil end
-            tmp = rewardByRole[roleId] or {}
-            if not next(tmp)  then
-                local name = getNameByRoleId(roleId)
-                tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
-            else
-                if not tmp[spKey] then
-                    local name = getNameByRoleId(roleId)
-                    tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
-                else
-                    tmp[spKey].amount = tmp[spKey].amount + 1
-                end
-            end
-            rewardByRole[roleId] = tmp
+            local name = getNameByRoleId(roleId)
+            tmp = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
+            table.insert(rewardByRole, tmp)
             count = count - 1
         end
@@ -306,20 +353,11 @@ local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
 end
-local rewardToNtyFunc = function(notify, tmpReward)
-    for key, val in pairs(tmpReward or {}) do
-        if not notify[key] then
-            notify[key] = clone(val)
-        else
-            for k, v in pairs(val) do
-                if not notify[key][k] then
-                    notify[key][k] = v
-                else
-                    notify[key][k] = notify[key][k].amount + v.amount
-                end
-            end
-
-        end
+local rewardToRecordFunc = function(specialsRecord, recordAmount, rewardByRole)
+    if not specialsRecord[recordAmount] then
+        specialsRecord[recordAmount] = rewardByRole
+    else
+        table.insert(specialsRecord[recordAmount], rewardByRole)
     end
 end
@@ -357,12 +395,12 @@ function Capsule:getTop(record, recordAmount,now)
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP,now)
+    local rewardByRole, count = getSpecialReward(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
@@ -379,12 +417,11 @@ function Capsule:getCore(record, recordAmount,now)
-    local np = special["np"]
-    if np > recordAmount then return nil end
+    local count = special["np"]
+    if count > recordAmount then return nil end
-    local left = math.ceil((np - recordAmount)/2) or 0
-    local count = np
+    local left = math.ceil((count - recordAmount)/2) or 0
     local roleRecord = {}
     for i, v in ipairs(record) do
         if count <= 0 then break end
@@ -407,17 +444,17 @@ function Capsule:getCore(record, recordAmount,now)
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.CORE,now)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.CORE,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getLast(record,now)
+function Capsule:getLast(record, recordAmount, now)
     local spKey, special = self:checkSpecialFlag(SpecialType.LAST)
     if not special then return nil end
@@ -426,8 +463,7 @@ function Capsule:getLast(record,now)
     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
@@ -448,17 +484,17 @@ function Capsule:getLast(record,now)
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getJoker(record,now)
+function Capsule:getJoker(record, recordAmount, now)
     local spKey, special = self:checkSpecialFlag(SpecialType.JOKER)
     if not special then return nil end
@@ -474,37 +510,50 @@ function Capsule:getJoker(record,now)
         end
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
+    local rewardByRole, count = getSpecialReward(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
-function Capsule:getKing(record,now)
+function Capsule:getKing(record, recordAmount, now)
     local spKey, special = self:checkSpecialFlag(SpecialType.KING)
     if not special then return nil end
     local specials = self:getProperty("specials") or {}
     local specialsRecord = self:getProperty("specialsRecord") or {}
+    local rank = self:getProperty("rank") or {}
+    if not next(rank) then return nil end
     local roleRecord = {}
-    for _, v in ipairs(record) do
-        if not roleRecord[v.roleId]then
-            roleRecord[v.roleId]  = {amount = v.amount }
-        else
-            roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
-        end
+
+    for roleId, count in pairs(rank) do
+        table.insert(roleRecord, {roleId = roleId, count = count})
+    end
+    table.sort(roleRecord, function(a, b) return a.count > b.count end)
+
+    local count = math.min(special["amount"], #roleRecord)
+
+    local rewardByRole = {}
+    local index = 1
+    while (count > 0 ) do
+        count  = count - 1
+        local tmp = roleRecord[index]
+        if not tmp then break end
+        index = index + 1
+
+        local name = getNameByRoleId(tmp.roleId)
+        table.insert(rewardByRole, {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = special["award"], amount = 1, SpecialType.KING, create_time= now})
     end
-    local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.KING,now)
     special["amount"] = count
     specials[spKey] = special
-    rewardToNtyFunc(specialsRecord, rewardByRole)
+    rewardToRecordFunc(specialsRecord, recordAmount, rewardByRole)
     self:setProperties({specialsRecord = specialsRecord, specials = specials})
     return rewardByRole
 end
@@ -523,16 +572,16 @@ function Capsule:checkSpecialReward(now, goodsAmount)
     if goodsAmount == 0 then
         local coreReward = self:getCore(record, recordAmount, now)
-        rewardToNtyFunc(notify, coreReward)
+        rewardToRecordFunc(notify, recordAmount, coreReward)
-        local lastReward = self:getLast(record, now)
-        rewardToNtyFunc(notify, lastReward)
+        local lastReward = self:getLast(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, lastReward)
-        local jokerReward = self:getJoker(record, now)
-        rewardToNtyFunc(notify, jokerReward)
+        local jokerReward = self:getJoker(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, jokerReward)
-        local kingReward = self:getKing(record, now)
-        rewardToNtyFunc(notify, kingReward)
+        local kingReward = self:getKing(record, recordAmount, now)
+        rewardToRecordFunc(notify, recordAmount, kingReward)
     end
     return notify
@@ -572,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, 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
+        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
@@ -601,12 +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)
-    --TODO 先屏蔽
-    return {}
+    return incentiveByRole
+end
+
+local rewardCollect = function(reward, goods)
+    for _, v in pairs(goods) do
+        for id, count in pairs(v.award:toNumMap()) do
+            reward[id] = (reward[id] or 0) + count * v.amount
+        end
+    end
+end
+
+local rewardCollectByRoleId = function(roleId, reward, goods)
+    local tmp = {}
+    for _, val in pairs(goods) do
+        for _, v in ipairs(val) do
+            if v.roleId == roleId then
+                for id, count in pairs(v.award:toNumMap()) do
+                    reward[id] = (reward[id] or 0) + count * v.amount
+                end
+                if not tmp[v.good_id] then
+                    tmp[v.good_id] = v
+                 else
+                    tmp[v.good_id].amount = tmp[v.good_id].amount + v.amount
+                end
+            end
+        end
+    end
+    return tmp
 end
 function Capsule:drawByCount(roleId, count)
@@ -614,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 {}
@@ -623,9 +707,8 @@ function Capsule:drawByCount(roleId, count)
     local goods_id = ichibankuji["goods_id"]
     local now = skynet.timex()
-    --奖励， 通知信息
-    local  notify= {}
-    notify[roleId] = {}
+    --奖励，普通奖品信息
+    local  goodsByUsual= {}
     local name = getNameByRoleId(roleId)
     while (goods and next(goods) and count > 0) do
@@ -636,15 +719,18 @@ function Capsule:drawByCount(roleId, count)
         if good and good.amount > 0 then
             good.amount = good.amount - 1
+            --插入rank
+            rankRole = rankRole + 1
+
             --插入记录
             local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = 1, quality = good.quality, create_time= now}
             table.insert(record, tmpNotify)
             --作为奖励记录+通知
-            if not notify[roleId][good_id] then
-                notify[roleId][good_id] = tmpNotify
+            if not goodsByUsual[good_id] then
+                goodsByUsual[good_id] = tmpNotify
             else
-                notify[roleId][good_id].amount = notify[roleId][good_id].amount + 1
+                goodsByUsual[good_id].amount = goodsByUsual[good_id].amount + 1
             end
             --记录角色的抽奖记录 计算激励奖需要用到
@@ -659,48 +745,52 @@ function Capsule:drawByCount(roleId, count)
         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
+    --奖励池重新赋值
+    rank[roleId] = rankRole
+    recordByRole[roleId] = roleRecord
+    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
 function Capsule:drawAll(roleId)
     local goods = self:getProperty("goods") or {}
     local record = self:getProperty("record") or {}
+    local rank = self:getProperty("rank") or {}
+    local rankRole = rank[roleId] or 0
     local recordByRole = self:getProperty("recordByRole") or {}
     local roleRecord = recordByRole[roleId] or {}
     local now = skynet.timex()
     local name = getNameByRoleId(roleId)
-    local notify = {}
-    notify[roleId] = {}
+    local goodsByUsual = {}
     for good_id, good in pairs(goods) do
         if good.amount > 0 then
+            --插入rank
+            rankRole = rankRole + good.amount
+
             --插入记录
             local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = good.amount, quality = good.quality, create_time = now}
             for i = 1, good.amount do
@@ -708,10 +798,10 @@ function Capsule:drawAll(roleId)
             end
             --作为奖励记录+通知
-            if not notify[roleId][good_id] then
-                notify[roleId][good_id] = tmpNotify
+            if not goodsByUsual[good_id] then
+                goodsByUsual[good_id] = tmpNotify
             else
-                notify[roleId][good_id].amount = notify[roleId][good_id].amount + good.award
+                goodsByUsual[good_id].amount = goodsByUsual[good_id].amount + good.award
             end
             --记录角色的抽奖记录
@@ -725,40 +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 goodsAmount = self:getGoodsAmount()
-    local speciNotify = self:checkSpecialReward(now, goodsAmount)
-    rewardToNtyFunc(notify, speciNotify)
-
-    local reward, rewardByGoods = {}, {}
-    for key, val in pairs(notify) do
-        if key == roleId then
-            for k, v in pairs(val) do
-                for id, count in pairs(v.award:toNumMap()) do
-                    reward[id] = (reward[id] or 0) + count
-                end
-                rewardByGoods[k] = v
-            end
-        end
+    --奖励收集
+    local reward = {}
+    rewardCollect(reward, goodsByUsual)
-    end
+    local goodsByIncentive = self:checkIncentive(roleId, name, now)
+    rewardCollect(reward, goodsByIncentive)
+    local goodsAmount = self:getGoodsAmount()
     if goodsAmount == 0 then
         self:setProperty("drawEndTime", now)
     end
-    return reward, rewardByGoods, notify
+    local goodsBySpecial = self:checkSpecialReward(now, goodsAmount)
+    local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial)
+
+    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
@@ -789,6 +871,77 @@ function Capsule:draw(roleId, full, cares)
     end
 end
+function Capsule:pageRecord(up, idx)
+    local record = self:getProperty("record") or {}
+    if not next(record) then return nil end
+
+    --默认取20条
+    idx = idx or #record
+    up = up or 0
+
+    local count = 0
+    local tmpRecord = {}
+    if up == 1 then
+        --向上获取索引更大的  从上往下拉
+        count = math.min(#record - idx, 20)
+        for i = idx, count do
+            tmpRecord[i] = record[i]
+        end
+    else
+        --向下获取索引更小的 从下往上拉
+        count = math.max(idx - 20, 0)
+        for i = count, idx do
+            tmpRecord[i] = record[i]
+        end
+    end
+
+    return tmpRecord
+end
+
+--检查是否有未领取奖励的通知
+function Capsule:getSpecialNotify(roleId)
+    local specialsRecord = self:getProperty("specialsRecord") or {}
+    local tmp = {}
+    for _, goods in pairs(specialsRecord)  do
+        for _, good in ipairs(goods) do
+            if good.roleId == roleId then
+                if not good.nty or good.nty == 0 then
+                    tmp[good.good_id] = good
+                end
+            end
+        end
+    end
+    self:setProperty("specialsRecord", specialsRecord)
+
+    return tmp
+end
+
+function Capsule:clearSpecialNty(roleId, good_ids)
+    local specialsRecord = self:getProperty("specialsRecord") or {}
+    for _, goods in pairs(specialsRecord)  do
+        for _, good in ipairs(goods) do
+            for _, good_id in ipairs(good_ids) do
+                if good_id == good.good_id and good.roleId == roleId then
+                    good.nty = 1
+                end
+            end
+        end
+    end
+    self:setProperty("specialsRecord", specialsRecord)
+end
+
+function Capsule: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 {
@@ -799,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
@@ -214,6 +214,9 @@ Role.schema = {
 	heroCnt			    = {"number", 0},	-- 英雄数量
 	friendTeam			= {"table", {}},	-- 好友切磋队伍信息 {bInfo = {}, team = {}, v = 0}
 	bgId			    = {"number", 0},	-- 看板娘id
+
+	worldChangePoints   = {"table", {}}, 	-- 世界变动积分 {[1]= 转盘抽取次数, [2]= 获得的积分, [3]=魔导石消耗, [4]= 虹光玉消耗}
+    worldLineReward 	= {"table", {}},    -- 世界积分 领取记录 {[id] = 1}
 }
@@ -457,6 +460,8 @@ function Role:data()
 		unlockChap	= self:getProperty("unlockChap"),	-- 解锁的章节
 		friendTeam	= self:getProperty("friendTeam"),
 		bgId	= self:getProperty("bgId"),
+		worldChangePoints = self:getProperty("worldChangePoints"),
+		worldLineReward = self:getProperty("worldLineReward"),
 	}
 end
@@ -168,6 +168,9 @@ RoleCross.bind = function (Role)
 				self:checkTaskEnter("Wake", {heroType = heroId, wakeL = initData.heros.wakeL})
 				self:checkTaskEnter("WakeCG", {heroType = heroId})
 				self:checkTaskEnter("HeroTalent", {heroType = heroId, alv = aheadLevel})
+				if initData.heros.wakeL == 3 then
+					self:checkTaskEnter("WakeCGSum", {count = 1})
+				end
 			end
 		end
@@ -211,7 +214,6 @@ RoleCross.bind = function (Role)
 	end
 	function Role:paySpecialReward(roleId, notify)
-		dump(notify)
 		if notify and next(notify) then
 			local reward = {}
 			for key, val in pairs(notify) do
@@ -221,6 +223,7 @@ RoleCross.bind = function (Role)
 			end
 			self:award(reward,  {log = {desc = "CapsuleReward", int1=roleId}})
+			SendPacket(actionCodes.Capsule_notifyChange, MsgPack.pack({special = notify}))
 		end
 	end
@@ -385,7 +388,6 @@ function CMD.redPTag(roleId, tag, pms)
 end
 function CMD.paySpecialReward(roleId, notify)
-	dump(notify)
 	if notify and next(notify) then
 		local reward = {}
 		for key, val in pairs(notify) do
@@ -66,8 +66,10 @@ local ItemReason = {
     shopBuy = 150,  -- 商店购买
 	monthCardReward = 151, --月卡奖励
 	smonthCardReward = 152, --特刊奖励
-	itemConvertmonthCard = 153, --兑换月卡
-	itemConvertsmonthCard = 154, --兑换特刊
+	itemConvertSpecial = 153, --兑换月卡/战令/探索指令  特殊道具
+	buyDiamondCardReward  = 154, --购买钻石额外赠送奖励
+	firstMonthCardReward = 155, --首次订阅月卡奖励
+	firstSMonthCardReward = 156, --首次订阅特刊奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -163,6 +165,8 @@ local ItemReason = {
 	CapsuleReward = 1411, --扭蛋机奖励
 	CapsuleConvert = 1412, --扭蛋机 消耗票 兑换
 	CapsuleCoinCost = 1413, --抽扭蛋机消耗
+
+	worldLine = 1500, --世界线积分
 }
@@ -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)
@@ -563,9 +574,16 @@ function RolePlugin.bind(Role)
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
 		self:checkTaskEnter("CostDiamond", {count = count})
+        self:checkWorldChangePoints({[ItemWorldLine.CostDiamond]=count})
 		return true
 	end
+	function Role:costJade(param)
+        self:addItem(param)
+		self:checkTaskEnter("CostJade", {count = - param.count})
+		self:checkWorldChangePoints({[ItemWorldLine.CostJade]= -param.count})
+	end
+
 	function Role:increBy(field, val)
 		local roleIncre = self:getProperty("roleIncre")
 		local curId = roleIncre[field] or 0
@@ -592,6 +610,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()
@@ -604,6 +623,8 @@ function RolePlugin.bind(Role)
 		end
 		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
 		self:checkTaskEnter("HeroQualityCollect", {})
+		self:checkTaskEnter("HeroStartSum", {})
+
 		if not params.notNotify then
 			local heroResponse = {}
 			table.insert(heroResponse, newHero:data())
@@ -2037,10 +2058,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 +2111,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
@@ -2414,7 +2435,7 @@ function RolePlugin.bind(Role)
 			return 1
 		end
-		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) and rechargeData.shop ~= 2 then
+		if not self.storeData:checkRechargeRecord(rechargeData.limit, id)then
 			return 2
 		end
@@ -2429,6 +2450,12 @@ function RolePlugin.bind(Role)
 				self:updateProperty({field = "rechargeF", value = rechargeF})
 			end
 			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
+
+			--已购月卡 购买魔导石 赠送cardReward
+			if not self.storeData:isMonthCardExpire() then
+				reward, _ = self:award(rechargeData.cardReward, {isRecharge = true, log = {desc = "buyDiamondCardReward", int1 = id}})
+			end
+
 		elseif rechargeData.shop == 2 then  --通行证商店
             --签收 + 订阅奖励
 			local tmpreward, _ = self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
@@ -2437,6 +2464,8 @@ function RolePlugin.bind(Role)
 			end
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
+
+			self:checkTaskEnter("BuyLimitPack", {id = id})
 		else
 			skynet.error("[recharge] invalid recharge shop type " .. id)
 			return 3
@@ -2991,6 +3020,22 @@ function RolePlugin.bind(Role)
 		return levelBnous[SystemBnousType.ChangeBuyCount] or 0
 	end
+	function Role:getExtraProp()
+		local levelBnous = self:getLevelBnous()
+		local extraPropReward =  levelBnous[SystemBnousType.ExtraProp] or {}
+		local reward = {}
+		for k, v in pairs(extraPropReward) do
+			reward[k] = (reward[k] or 0) + v
+		end
+		return reward
+	end
+
+	function Role:getAccountLevel()
+		local levelBnous = self:getLevelBnous()
+		dump(levelBnous)
+		return levelBnous[SystemBnousType.AccountLevel] or 0
+	end
+
 	function Role:getLevelBnous()
 		local levelBnous = {}
         local curLevel = self:getProperty("level")
@@ -3019,6 +3064,11 @@ function RolePlugin.bind(Role)
 							levelBnous[pm1] = 0
 						end
 						levelBnous[pm1] = levelBnous[pm1] + pm2
+					elseif pm1 == SystemBnousType.AccountLevel  then
+						if type(levelBnous[pm1]) == "table" then
+							levelBnous[pm1] = 0
+						end
+						levelBnous[pm1] = math.max(levelBnous[pm1], pm2)
 					else
 						levelBnous[pm1][pm2] = (levelBnous[pm1][pm2] or 0) + pm3
 					end
@@ -3153,10 +3203,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 +3215,20 @@ function RolePlugin.bind(Role)
 	end
 	function Role:drawCapsule(capsuleId, full, cares)
-        local capsule = self.capsules[capsuleId] or {}
-		if next(capsule) then
-			local roleId = self:getProperty("id")
-            return capsule:draw(roleId, full, cares)
-		end
-		return 3
+        local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		local roleId = self:getProperty("id")
+		local ret, drawReward = capsule:draw(roleId, full, cares)
+		drawReward["specials"] = nil
+		return ret, drawReward, capsule:data(roleId)
 	end
-	function Role:joinCapsule(capsuleId)
-		local capsule = self.capsules[capsuleId] or {}
-        return capsule:data()
+	function Role:joinCapsule(roleId, capsuleId)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+        return capsule:data(roleId)
 	end
 	function Role:checkCapsule(now)
@@ -3188,13 +3241,17 @@ function RolePlugin.bind(Role)
 	end
 	function Role:goodStock(capsuleId)
-		local capsule = self.capsules[capsuleId] or {}
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return 0 end
+
 		return capsule:getGoodsAmount(),  capsule:getProperty("token")
 	end
-	function Role:getCapsuleData(capsuleId)
-		local capsule = self.capsules[capsuleId] or {}
-		return capsule:data()
+	function Role:getCapsuleData(roleId, capsuleId)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		return capsule:data(roleId)
 	end
 	function Role:resetCapsule()
@@ -3220,6 +3277,38 @@ function RolePlugin.bind(Role)
 			end
 		end
 	end
+
+	function Role:pageRecord(capsuleId, up, idx)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		return capsule:pageRecord(up, idx)
+	end
+
+	function Role:getSpecialNotify(roleId, capsuleId)
+		local capsule = self.capsules[capsuleId]
+		if not capsule then return nil end
+
+		return capsule:getSpecialNotify(roleId)
+	end
+
+	function Role:checkWorldChangePoints(param)
+        local worldChangePoints = self:getProperty("worldChangePoints") or {}
+		if param[ItemWorldLine.CostJade] then
+			worldChangePoints[ItemWorldLine.CostJade] = (worldChangePoints[ItemWorldLine.CostJade] or 0) + param[ItemWorldLine.CostJade]
+			local cost = math.floor(worldChangePoints[ItemWorldLine.CostJade] / globalCsv.worldline_gift)
+			worldChangePoints[ItemWorldLine.CostJade] = worldChangePoints[ItemWorldLine.CostJade] - cost * globalCsv.worldline_gift
+			worldChangePoints[ItemWorldLine.RouletteCount] = (worldChangePoints[ItemWorldLine.RouletteCount] or 0) + cost
+		end
+
+		if param[ItemWorldLine.CostDiamond] then
+			worldChangePoints[ItemWorldLine.CostDiamond] = (worldChangePoints[ItemWorldLine.CostDiamond] or 0) + param[ItemWorldLine.CostDiamond]
+            local cost = math.floor(worldChangePoints[ItemWorldLine.CostDiamond] / globalCsv.worldline_count_currency)
+			worldChangePoints[ItemWorldLine.CostDiamond] = worldChangePoints[ItemWorldLine.CostDiamond] - cost * globalCsv.worldline_count_currency
+			worldChangePoints[ItemWorldLine.Points] = (worldChangePoints[ItemWorldLine.Points] or 0) + cost
+		end
+		self:setProperty("worldChangePoints", worldChangePoints)
+	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,8 @@ local TaskType = {
 	ActBattlePass = 911,		-- 活动关卡通关		-- chapterId
 	Appoint = 912, 				-- 触发限时礼包，指定id
 	Rename = 913,				-- 重命名
+    CostJade = 914, 			-- 消耗虹光玉
+	BuyLimitPack = 915, 		-- 购买指定id礼包触发
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -271,6 +276,13 @@ 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")}},
+		[TaskType.BuyLimitPack] = {{TriggerEventType.BuyLimitPack, f("id")}},
+		[TaskType.HeroTalent] = {{TriggerEventType.HeroTalent, f("count")}},
 	}
 }
@@ -318,6 +330,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 +753,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 +773,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 +806,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 +835,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
@@ -30,11 +30,12 @@ Store.schema = {
 	monthCardEx	= {"number", 0},		-- 期数
 	monthCardId	= {"number", 0},		-- 月卡id
-    firstMonthCard =  {"number", 1},      -- 首次订阅月卡
+    firstMonthCard =  {"number", 0},      -- 首次订阅月卡
     monthCardReceive = {"number", 0},      -- 月卡奖励领取记录 当天 0-未领取， 1-已经领取
     smonthCards = {"table", {}},     --特刊信息 {[id]={["buyCount"]=0, ["periods"]=0}} buyCount: 购买次数，periods: 剩余期数，
     smonthCardReceive = {"number", 0},      -- 特刊奖励领取记录 当天 0-未领取， 1-已经领取
+    firstSMonthCard =  {"table", {}},      -- 首次订阅当期特刊
 	battleCard	= {"number", 0},		-- 赛季卡
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
@@ -55,6 +56,7 @@ Store.schema = {
     dailyShop = {"table", {}},
     weekShop = {"table", {}},
+    dayLimitInfo = {"table", {}},       -- {[id]={count=0, trigger=0}}
 }
 function Store:updateProperty(params)
@@ -80,6 +82,7 @@ function Store:onCrossDay()
     --self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
     --self:checkPaySignReward()
+    self:resetDayLimitPackTriggerCount()
     --刷新商店
     self:flushDailyShop()
@@ -93,100 +96,15 @@ function Store:refreshWeekData(notify)
     self:flushWeekShop()
 end
-local SuperMonthCard = {}
-SuperMonthCard["buy"] = function(self, id)
-    local smonthCards = self:getProperty("smonthCards") or {}
-
-    local buyLimitFunc = function(buylimit)
-        for k, v in pairs(buylimit) do
-            if k == 1 then
-                if v == 101 then
-                    if self:isMonthCardExpire() then
-                        skynet.error("月卡过期")
-                        return false
-                    end
-                else
-                    if smonthCards[v] == nil then
-                        skynet.error("没有购买增刊里的条件, %d", v)
-                        return false
-                    end
-                end
-            elseif k == 2 then
-                if smonthCards[v] == nil and v ~= 101 then
-                    skynet.error("没有购买增刊里的条件, %d", v)
-                    return false
-                end
-                if SuperMonthCard["isExpired"](self, v) == false and v ~= 101 then
-                    skynet.error("上期特刊奖励没有领取完")
-                    return false
-                end
-            end
-        end
-        return true
-    end
-
-    local BuyMonthCard = {}
-    BuyMonthCard["renewal"]= function()
-        --续刊
-        local card = csvdb["shop_cardCsv"][id] or {}
-        if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if buyLimitFunc(card["buyLimit"]:toNumMap()) == false then
-                skynet.error("不满足购买条件")
-                return false
-            end
-        end
-
-        local smonthCard = smonthCards[id] or {}
-        if next(smonthCard) then
-            smonthCard["buyCount"] = (smonthCard["buyCount"] or 0) + 1
-            local periods = SuperMonthCard["periods"](self, id) + (card["amount"] or 30)
-            smonthCard["periods"] = periods
-
-            self:updateProperty({field = "smonthCards", value = smonthCards})
-            return true
-        end
-    end
-    BuyMonthCard["order"] = function()
-        --增刊条件
-        local card = csvdb["shop_cardCsv"][id] or {}
-        if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if buyLimitFunc(card["buyLimit"]:toNumMap()) == false then
-                skynet.error("不满足增刊条件")
-                return false
-            end
-        end
-        smonthCards[id] = {["periods"] = (card["amount"] or 30), ["buyCount"] = 1}
-
-        self:updateProperty({field= "smonthCards", value = smonthCards})
-        return true
-    end
-
-    if SuperMonthCard["isExpired"](self, id) then
-        local smonthCard = smonthCards[id] or {}
-        if next(smonthCard) then
-            return BuyMonthCard["renewal"]()
-        else
-            return BuyMonthCard["order"]()
-        end
-    else
-        return BuyMonthCard["renewal"]()
-    end
-end
-
-SuperMonthCard["periods"] = function(self, id)
+local function getSMonthCardPeriods(self, id)
     local smonthCards = self:getProperty("smonthCards") or {}
     local smonthCard = smonthCards[id] or {}
     return smonthCard["periods"] or 0
 end
-SuperMonthCard["isExpired"] = function (self, id)
-    local periods = SuperMonthCard["periods"](self, id)
-    return periods == 0
-end
-
-SuperMonthCard["itemDaily"] = function(self, id)
-    local cur_ex = SuperMonthCard["periods"](self, id)
+local function getCardItemDailyReward(self, id)
+    local cur_ex = getSMonthCardPeriods(self, id)
     if cur_ex == 0 then return nil, nil end
     cur_ex = cur_ex - 1
@@ -201,7 +119,7 @@ SuperMonthCard[&quot;itemDaily&quot;] = function(self, id)
     return reward, change, cur_ex
 end
-SuperMonthCard["itemFirst"] = function(self, id)
+local function getCardItemFirstReward(self, id)
     local card = csvdb["shop_cardCsv"][id] or {}
     local reward, _ = self.owner:award(card["itemFirst"], {isRecharge = true, log = {desc = "recharge", int1 = id}})
     return reward
@@ -219,6 +137,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()
@@ -373,8 +300,8 @@ end
 function Store:getSMonthCardDailyReward(id)
     if not id then return nil end
-    local before_ex = SuperMonthCard["periods"](self, id)
-    local reward, change, cur_ex= SuperMonthCard["itemDaily"](self, id)
+    local before_ex = getSMonthCardPeriods(self, id)
+    local reward, change, cur_ex= getCardItemDailyReward(self, id)
     --今日特刊奖励已经领取
     self:updateProperty({field = "smonthCardReceive", value = 1})
@@ -391,14 +318,110 @@ function Store:getSMonthCardDailyReward(id)
 end
 function Store:firstBuyMonthCard(id)
-    if self:getProperty("firstMonthCard") == 1 then
-        self:updateProperty({field = "firstMonthCard", value = 0})
+    if self:getProperty("firstMonthCard") == 0 then
+        self:updateProperty({field = "firstMonthCard", value = 1})
+        local card = csvdb["shop_cardCsv"][id] or {}
+        return self.owner:award(card["itemOnce"], {log = {desc = "firstMonthCardReward", int1 = id}})
+    end
+    return nil
+end
+
+function Store:firstBuySMonthCard(id)
+    local firstSMonthCard = self:getProperty("firstSMonthCard") or {}
+    if not firstSMonthCard[id] or firstSMonthCard[id] == 0 then
+        firstSMonthCard[id] = 1
+        self:updateProperty({field = "firstSMonthCard", value = firstSMonthCard})
         local card = csvdb["shop_cardCsv"][id] or {}
-        return self.owner:award(card["itemOnce"], {log = {desc = "monthCardReward", int1 = id, int2 = 30}})
+        return self.owner:award(card["itemOnce"], {log = {desc = "firstSMonthCardReward", int1 = id}})
     end
     return nil
 end
+function Store:isSMonthCardExpired(id)
+    return getSMonthCardPeriods(self, id) == 0
+end
+
+function Store:buySMonthCardLimit(buylimit)
+    local smonthCards = self:getProperty("smonthCards") or {}
+    for k, v in pairs(buylimit) do
+        if k == 1 then
+            if v == 101 then
+                if self:isMonthCardExpire() then
+                    skynet.error("月卡过期")
+                    return false
+                end
+            else
+                if smonthCards[v] == nil then
+                    skynet.error("没有购买增刊里的条件, %d", v)
+                    return false
+                end
+            end
+        elseif k == 2 then
+            if smonthCards[v] == nil and v ~= 101 then
+                skynet.error("没有购买增刊条件里的特刊, %d", v)
+                return false
+            end
+            if self:isSMonthCardExpired(v) == false and v ~= 101 then
+                skynet.error("上期特刊奖励没领完") --策划yc+hbw 没领完上期特刊，新一期特刊不展示，不允许购买
+                return false
+            end
+        end
+    end
+    return true
+end
+
+function Store:buySMonthCard(id)
+    local smonthCards = self:getProperty("smonthCards") or {}
+
+    local BuyMonthCard = {}
+    BuyMonthCard["renewal"]= function()
+        --续刊
+        local card = csvdb["shop_cardCsv"][id] or {}
+        if card["buyLimit"] and card["buyLimit"] ~= "" then
+            if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then
+                skynet.error("不满足购买条件")
+                return false
+            end
+        end
+
+        local smonthCard = smonthCards[id] or {}
+        if next(smonthCard) then
+            smonthCard["buyCount"] = (smonthCard["buyCount"] or 0) + 1
+            local periods = (smonthCard["periods"] or 0) + (card["amount"] or 30)
+            smonthCard["periods"] = periods
+
+            self:updateProperty({field = "smonthCards", value = smonthCards})
+            return true
+        end
+    end
+
+    BuyMonthCard["order"] = function()
+        --增刊
+        local card = csvdb["shop_cardCsv"][id] or {}
+        if card["buyLimit"] and card["buyLimit"] ~= "" then
+            if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then
+                skynet.error("不满足增刊条件")
+                return false
+            end
+        end
+
+        smonthCards[id] = {["periods"] = (card["amount"] or 30), ["buyCount"] = 1}
+        self:updateProperty({field= "smonthCards", value = smonthCards})
+        return true
+    end
+
+    if self:isSMonthCardExpired(id) then
+        local smonthCard = smonthCards[id] or {}
+        if next(smonthCard) then
+            return BuyMonthCard["renewal"]()
+        else
+            return BuyMonthCard["order"]()
+        end
+    else
+        return BuyMonthCard["renewal"]()
+    end
+end
+
 -- 购买通行证
 function Store:onBuyCard(type, duration, id, actid)
     local timeNow = skynet.timex()
@@ -409,20 +432,23 @@ function Store:onBuyCard(type, duration, id, actid)
         self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + 30})
         local reward = {}
-        --初回特典  仅首次购买月卡时赠送SSR级角色"拉塔托娅"
-        local tmpreward, _ = self:firstBuyMonthCard(id)
+        local tmpreward, _ = self:firstBuyMonthCard(id) --初回特典  仅首次购买月卡
         if tmpreward then table.rewardMerge(reward, tmpreward) end
-        --订阅奖励
-        tmpreward = SuperMonthCard["itemFirst"](self, id)
+        tmpreward = getCardItemFirstReward(self, id) --订阅奖励
         if next(tmpreward) then table.rewardMerge(reward, tmpreward) end
         return reward
     elseif type == CardType.SuperMonthCard then
-        if SuperMonthCard["buy"](self, id) then
-            skynet.error("特刊购买成功:"..id)
-            return SuperMonthCard["itemFirst"](self, id)
+        if self:buySMonthCard(id) then
+            local reward = getCardItemFirstReward(self, id) or {}
+            local tmpreward, _ = self:firstBuySMonthCard(id)
+            if tmpreward then table.rewardMerge(reward, tmpreward) end
+
+            return reward
         end
+
+        skynet.error("特刊购买失败:"..id)
         return nil
     elseif type == CardType.NormalMonthCardLevelUp then
         if self:isMonthCardExpire() then
@@ -474,7 +500,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 +512,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,58 +617,64 @@ 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 rechargeCfg = csvdb["shop_normalCsv"][config.packId]
-        if rechargeCfg then
-            limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
-            self.owner:log("push_gift", {
-                gift_id = rechargeCfg.id, --礼包ID
-                gift_name = rechargeCfg.descId,   --礼包名称
-            })
-            -- 每日抽卡限时礼包 触发重置
-            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
+    if not config then return end
+
+    -- 每日循环弹窗
+    local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1, [TriggerEventType.HeroTalent] = 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_rechargeCsv"][config.packId]
+    if rechargeCfg then
+        limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
+        self.owner:log("push_gift", {
+            gift_id = rechargeCfg.id, --礼包ID
+            gift_name = rechargeCfg.descId,   --礼包名称
+        })
+        if config.isLoop ~= 0 then
+            local payR = self:getProperty("payR")
+            if payR[rechargeCfg.id] then
+                payR[rechargeCfg.id] = nil
+                self:updateProperty({field = "payR", value = payR})
             end
-            self:updateProperty({field = "limitTPack", value = limitPack})
         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
     --if next(result) then
     --    self:updateProperty({field = "packTrigger", value = triggerRecord})
@@ -831,6 +867,7 @@ function Store:data()
         totalRR = self:getProperty("totalRR"),
         monthCardId  = self:getProperty("monthCardId"),
         firstMonthCard = self:getProperty("firstMonthCard"),
+        firstsMonthCard = self:getProperty("firstsMonthCard"),
         monthCardReceive = self:getProperty("monthCardReceive"),
         smonthCards  = self:getProperty("smonthCards"),
         smonthCardReceive  = self:getProperty("smonthCardReceive"),
@@ -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
@@ -51,7 +51,9 @@ function getNameByRoleId(roleId)
 end
 function broadCastCapsule(roleId, capsuleId, broadInfo)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then print("not capsule :" .. capsuleId) return end
+
     local register = capsule:getProperty("register") or {}
     if next(capsule) then
         for id, _ in pairs(register) do
@@ -63,21 +65,23 @@ function broadCastCapsule(roleId, capsuleId, broadInfo)
 end
 function broadCastSpecial(roleId, capsuleId, broadInfo)
-    local capsule = capsules[capsuleId] or {}
+    if not broadInfo or not next(broadInfo) then return end
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return end
+
     local register = capsule:getProperty("register") or {}
-    if next(capsule) then
-        for id, _ in pairs(register) do
-            if id ~= roleId then
-                if broadInfo[id] then
-                    rpcRole(id, "paySpecialReward", id, broadInfo[id])
-                end
+    for id, _ in pairs(register) do
+        if id ~= roleId then
+            if broadInfo[id] then
+               rpcRole(id, "paySpecialReward", id, broadInfo[id])
             end
         end
     end
 end
 local function add(roleId, capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("add not capsule: " .. capsuleId) return end
     if next(capsule) then
         capsule:join(roleId)
         broadCastCapsule(roleId, capsuleId, {notifyType= NotifyChangeType.JOIN, roleId = roleId})
@@ -87,9 +91,12 @@ local function add(roleId, 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
@@ -98,8 +105,9 @@ 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()
@@ -114,13 +122,11 @@ function CMD.reset()
         for _, val in ipairs(data) do
             if val.type == 1 then
                 local key = val.id..val.room
-                if not capsules[key] then
-                    local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name})
-                    capsule:init()
-                    capsule:create()
-                    capsules[key] = capsule
-                    redisproxy:sadd(CAPSULE_INFO, key)
-                end
+                local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name})
+                capsule:init()
+                capsule:create()
+                capsules[key] = capsule
+                redisproxy:sadd(CAPSULE_INFO, key)
             end
         end
     end
@@ -149,11 +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
@@ -162,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
@@ -183,49 +192,76 @@ end
 function CMD.exit(roleId, capsuleId)
     if capsuleId then
-        local capsule = capsules[capsuleId] or {}
-        if next(capsule) then
-            capsule:exit(roleId)
-            broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
-        end
+        local capsule = capsules[capsuleId]
+        if not capsule then skynet.error("not capsule: " .. capsuleId) return end
+
+        capsule:exit(roleId)
+        broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
     else
-        for _, capsule in pairs(capsules) do
+        for id, capsule in pairs(capsules) do
             if next(capsule) then
                 capsule:exit(roleId)
-                broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
+                broadCastCapsule(roleId, id, {notifyType = NotifyChangeType.EXIT, roleId = roleId})
             end
         end
     end
 end
 function CMD.draw_capsule(roleId, capsuleId, full, drawsNum, cares)
-    local capsule = capsules[capsuleId] or {}
-    if next(capsule) then
-        local ret, reward, rewardByGoods, notify = capsule:draw(roleId, full, drawsNum, cares)
-        if ret > 5 then
-            --broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.DRAW, notify = notify})
-            broadCastSpecial(roleId, capsuleId, notify)
-        end
-        return ret, reward, rewardByGoods, capsule:data(roleId)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return 2 end
+
+    local ret, drawReward = capsule:draw(roleId, full, drawsNum, cares)
+    if ret > 5 then
+        --broadCastCapsule(roleId, capsuleId, {notifyType = NotifyChangeType.DRAW, notify = notify})
+        broadCastSpecial(roleId, capsuleId, drawReward["specials"])
     end
-    return 2
+    drawReward["specials"] = nil
+    return ret, drawReward, capsule:data(roleId)
 end
 function CMD.register(roleId, capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
     return capsule:register(roleId)
 end
 function CMD.goods_stock(capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return 0 end
+
     return capsule:getGoodsAmount(), capsule:getProperty("token")
 end
 function CMD.capsule_data(roleId, capsuleId)
-    local capsule = capsules[capsuleId] or {}
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
     return capsule:data(roleId)
 end
+function CMD.page_record(capsuleId, up, idx)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
+    return capsule:pageRecord(up, idx)
+end
+
+function CMD.get_special_nty(roleId, capsuleId)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
+    return capsule:getSpecialNotify(roleId)
+end
+
+function CMD.clear_special_nty(roleId, capsuleId, good_ids)
+    local capsule = capsules[capsuleId]
+    if not capsule then skynet.error("not capsule: " .. capsuleId) return nil end
+
+    return capsule:clearSpecialNty(roleId, good_ids)
+end
+
 skynet.start(function()
     skynet.dispatch("lua", function(session, address, cmd, ...)
         local f = CMD[string.lower(cmd)]
@@ -56,7 +56,7 @@ end
 -- 创建world以及union channel 用于广播
 function create_mutilcast()
-	for i = 1, 10 do
+	for i = 1, 50 do
 		local chan_w = mc:new()
 		datacenter.set("MC_W_CHANNEL" .. i, chan_w.channel)
 	end
@@ -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