Merge branch 'bugfix' into tr/ts

熊润斐
2 parents 6e7a6bd5 3a3a3ddf
Showing 35 changed files with 1066 additions and 260 deletions Show diff stats
config/develop.lua
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvBuff.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/agent.lua
src/csvdata
src/main.lua
src/models/Activity.lua
@@ -2,10 +2,11 @@ include(&quot;basic.lua&quot;)
  
 logd = 0 -- 是否开启日志
 thread = 4
-codeurl = "192.168.8.223:9090"
+codeurl = "192.168.0.199:9090"
 servId = 1
  
 max_client = 64
+max_queue = 64
  
 server_port = 12001
 debug_port = 10001
 XXTEA_KEY = "699D448D6D24f7F941E9F6E99F823E18"
-RESET_TIME = 0
+RESET_TIME = 4
  
-START_RESET_TIME_BASE = 1584316800 -- 0时区
+START_RESET_TIME_BASE = 1584316800 + RESET_TIME * 3600 -- 0时区
 DAY_SEC = 86400
 TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date("!*t", START_RESET_TIME_BASE))) / 3600)  -- 本地时区
  
@@ -69,6 +69,7 @@ ItemType = {
 	FuncOpen					= 15, 	-- 管理功能开放
 	SpeedBox					= 16, 	-- 加速箱子
 	SelectItemBox				= 17, 	-- 自选箱子
+	CommonPaster				= 18, 	-- 万能贴纸
 }
  
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -211,6 +212,7 @@ AdvBackEventType = {
 	Artifact = 24, --获得神器
 	Level = 25, -- 升级
 	LinkChooseOver = 26, -- 连锁事件结束
+	BuffEffect = 27, -- buff 效果
 }
  
 AdvScoreType = {
@@ -256,7 +258,7 @@ SettingStatus = {
 	},
 }
  
-EMAIL_LIMIT = 20  --邮件最大数量
+EMAIL_LIMIT = 50  --邮件最大数量
  
 RedPointTags = {
 	PvpCR = 1,
@@ -307,9 +309,13 @@ MailId = {
 }
  
 TriggerEventType = {
-    HangPass = 1,
-    LevelUp = 2,
+	HangPass = 1,
+	AdvPass = 2,
     TowerPass = 3,
+	LevelUp = 4,
+	AddNewHero = 5,
+	SSRCount = 6,
+	AfterTs = 7, 	-- 某时间以后
 }
  
 DrawCardType = {
@@ -7,6 +7,7 @@ actionCodes = {
 	Sys_commonNotice = 5,
 	Sys_maintainNotice = 6,
 	Sys_customNotice = 7,
+	Sys_checkQueue = 8,
  
 	Gm_clientRequest = 20,
 	Gm_receiveResponse = 21,
@@ -47,6 +48,7 @@ actionCodes = {
 	Role_getDownloadCvRewardRpc = 132,
 	Role_updateFeedbackInfoRpc = 133,
 	Role_useSelectItemRpc = 134,		-- 使用多选一礼包
+	Role_broadGetSSR = 135,		-- 全服广播 获得ssr英雄
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -208,6 +210,8 @@ actionCodes = {
 	Activity_sudokuRewardRpc = 652,
 	Activity_actSignRpc = 653,
 	Activity_actPaySignRewardNtf = 654,
+	Activity_actCalendaTaskRpc = 655,
+	Activity_actPaySignRpc = 656,
 }
  
 rpcResponseBegin = 10000
@@ -183,19 +183,22 @@ end
 function _M.actPaySignRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
+	local dayIndex = msg.day
 	local actGoodsFlag = role.storeData:getProperty("actGoodsFlag")
 	local index = GetActGoodsIndex("paySignIn")
-	local flag = actGoodsFlag[index] or 0
-	if flag == 0 then return 1 end
+	local ts = actGoodsFlag[index] or 0
+	if ts == 0 then return 1 end
  
-	if not role.activity:isOpen("PaySignIn") then return 2 end
+	local open, actId = role.activity:isOpen("PaySignIn")
+	if not open then return 2 end
  
-	local diffDay = diffFromOpen() + 1
+	local diffDay = diffFromTs(ts) + 1
  
 	local curData = role.activity:getActData("PaySignIn")
+	if not curData then return 3 end
 	local reward, change = {}
 	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
-		if day <= diffDay then
+		if day <= diffDay and day == dayIndex then
 			if not curData[day] then
 				curData[day] = 1
 				-- 奖励
@@ -203,8 +206,8 @@ function _M.actPaySignRpc(agent, data)
 					reward[itemId] = (reward[itemId] or 0) + count
 				end
 			end
-		else
-			break
+		--else
+		--	break
 		end
 	end
 	if next(reward) then
@@ -213,7 +216,7 @@ function _M.actPaySignRpc(agent, data)
 	end
  
 	role:log("activity", {
-		activity_id = curData[0], -- 活动ID（或活动指定任务的ID）
+		activity_id = actId, -- 活动ID（或活动指定任务的ID）
 		activity_type = role.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
 		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
@@ -222,4 +225,42 @@ function _M.actPaySignRpc(agent, data)
 	return true
 end
  
+function _M.actCalendaTaskRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local taskId = msg.id
+	local calTask = role:getProperty("calTask") or {}
+	local record = calTask["r"] or {}
+	local flag = record[taskId] or 0
+	if flag == 1 then return 1 end
+	local open, actId = role.activity:isOpen("CalendaTask")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not open then return 2 end
+	if not actData then return 3 end
+
+	local taskList = csvdb["activity_taskCsv"][actData.condition]
+	if not taskList then return 4 end
+	local taskCfg = taskList[taskId]
+	if not taskCfg then return 5 end
+	if taskCfg.key ~= actData.condition then return 6 end
+
+	if (calTask[taskId] or 0) < taskCfg.condition1 then return 7 end
+
+	record[taskId] = 1
+	calTask["r"] = record
+
+	role:updateProperty({field = "calTask", value = calTask})
+
+	local reward, change = role:award(taskCfg.reward, {log = {desc = "calendaTask"}})
+
+	role:log("activity", {
+		activity_id = taskId, -- 活动ID（或活动指定任务的ID）
+		activity_type = role.activity.ActivityType.CalendaTask, -- 活动类型，见活动类型枚举表
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
+	SendPacket(actionCodes.Activity_actCalendaTaskRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -250,7 +250,7 @@ function _M.startHangRpc(agent, data)
 	if not role:getAdvData():isRunning() then
 		role:updateProperty({field = "advTeam", value = {}})
 	end
-
+	role:pushMsg({type = "adv", slot = chapterId, time = adv_idle_time})
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
 	role:changeAdvCount(adv_idle_energy)
@@ -295,6 +295,7 @@ function _M.quickHangRpc(agent, data)
 	info.time = 0
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
+	role:pushCancel({type = "adv", slot = chapterId})
 	role:mylog("adv_action", {desc = "advQuickHang", int1 = chapterId})
  
 	SendPacket(actionCodes.Adv_quickHangRpc, '')
@@ -371,6 +372,7 @@ function _M.endHangRpc(agent, data)
 			-- else
 			-- 	role:updateProperty({field = "advC", delta = -chapterData.limitlevel})
 			-- end
+			role:pushCancel({type = "adv", slot = chapterId})
 		else
 			return
 		end
@@ -380,6 +382,8 @@ function _M.endHangRpc(agent, data)
  
 	role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
  
+	role:checkTaskEnter("AdvHang", {})
+
 	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull}))
 	return true
 end
@@ -435,6 +439,16 @@ function _M.finishTaskRpc(agent, data)
 	role:checkTaskEnter("AdvOverTask", {id = taskId})
  
 	adv:mylog({desc = "finishTask", int1 = taskId})
+	
+	role:log("mission_pick_achiev", {
+		mission_threadid = adv.chapterId, -- 大地图ID
+		mission_threadname = (csvdb["adv_chapterCsv"][adv.chapterId] or {})["chapter"] or "auto", -- 大地图名称
+		mission_id = adv.level, -- 关卡ID
+		mission_sequenceid = adv.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+		mission_pick_achiev_id = taskId, -- 任务ID
+		mission_pick_achiev_reward = reward, -- 任务奖励，[{"id":101,"num":10},{"id":102,"num":20},{"id":103,"num":30}]
+	})
+
  
 	SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -497,6 +511,15 @@ function _M.useItemRpc(agent, data)
 	adv:checkAchievement(adv.AchievType.UseItem, count, itemId)
 	adv:mylog({desc = "useItem", int1 = itemId, int2 = count})
  
+	role:log("mission_pick_use", {
+		mission_threadid = adv.chapterId, -- 大地图ID
+		mission_threadname = (csvdb["adv_chapterCsv"][adv.chapterId] or {})["chapter"] or "auto", -- 大地图名称
+		mission_id = adv.level, -- 关卡ID
+		item_id = itemId, -- 道具ID
+		mission_pick_use_num = count, -- 道具使用量
+		mission_sequenceid = adv.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	})
+
 	for i = 1, count do
 		adv:doActive(itemData.effect, target) -- target
 	end
@@ -583,6 +606,7 @@ function _M.wearArtifactRpc(agent, data)
  
 	local status = adv:wearArtifact(slot, id)
 	if not status then return 3 end
+
 	adv:saveDB()
  
 	role:finishGuide(55)
@@ -608,7 +632,20 @@ function _M.upArtifactRpc(agent, data)
 	if not adv:cost(cost, {}, true) then return 4 end
  
 	local status = adv:artifactLevelUp(id)
-	if not status then return 5 end
+	if not status then 
+		return 5 
+	else
+		role:log("mission_pick_reform", {
+			mission_threadid = adv.chapterId, -- 大地图ID
+			mission_threadname = (csvdb["adv_chapterCsv"][adv.chapterId] or {})["chapter"] or "auto", -- 大地图名称
+			mission_id = adv.level, -- 关卡ID
+			mission_pick_equip_id = id, -- 神器ID
+			mission_pick_reform_beflv = curLevel, -- 神器原等级
+			mission_pick_reform_aftlv = curLevel + 1, -- 神器现等级
+			mission_pick_reform_cost = cost[ItemId.AdvPoint], -- 消耗探险点数
+			mission_sequenceid = adv.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+		})
+	end
 	adv:cost(cost, {log = {desc = "upArtifact", int1 = id}})
 	adv:backCost(cost)
 	if status == 1 then -- 现在穿着呢。更新下
@@ -770,7 +807,7 @@ function _M.wheelSurfRpc(agent, data)
  
 	if not role:checkItemEnough(costs) then return 5 end
 	role:costItems(costs, {log = {desc = "advWheelSurf", int1 = ptype}})
-	role:addAdvLvExp(costs[ItemId.OldCoin] or 0)
+	local oldLv, lv = role:addAdvLvExp(costs[ItemId.OldCoin] or 0)
 	local advDrawB = role:getProperty("advDrawB")
 	advDrawB[ptype] = (advDrawB[ptype] or 0) + count
 	role:updateProperty({field = "advDrawB", value = advDrawB})
@@ -789,6 +826,16 @@ function _M.wheelSurfRpc(agent, data)
 	role:checkTaskEnter("AdvDraw", {count = count, ptype = ptype})
 	role:mylog("adv_action", {desc = "advWheelSurf", int1 = ptype, int2 = count})
  
+	role:log("mission_pick_fund", {
+		item_id = ItemId.OldCoin, -- 资助花费道具ID
+		mission_pick_fund_amount = costs[ItemId.OldCoin], -- 资助花费道具数量
+		mission_pick_fund_cnt = count, -- 资助花费道具次数，1或者10
+		mission_pick_fund_reward = reward, -- 资助获得奖励，[{"id":100,"num":10},{"id":101,"num":20},{"id":102,"num":30}]
+		mission_pick_fund_stagereward = {}, -- 资助阶段奖励
+		mission_pick_fund_beflv = oldLv, -- 资助前资助等级
+		mission_pick_fund_aftlv = lv, -- 资助后资助等级
+	})
+
 	SendPacket(actionCodes.Adv_wheelSurfRpc, MsgPack.pack({reward = backReward}))
 	return true
 end
@@ -75,6 +75,9 @@ function _M.addSellRpc( agent, data )
 	sells[slot].count = count
 	sells[slot].time = skynet.timex() - calSell.deltaTime
  
+	local needTime = sells[slot].count * dishData.sell_time + sells[slot].time - skynet.timex()
+	role:pushMsg({type = "food", slot = slot, time = needTime})
+
 	-- 检查解锁的顾客
 	local had = {}
 	for _, sell in pairs(sells) do
@@ -155,6 +158,7 @@ function _M.removeSellRpc( agent, data )
 	reward, change = role:award(reward, {log = {desc = "removeSell"}})
 	sells[slot].count = 0
  
+	role:pushCancel({type = "food", slot = slot})
 	role:log("restaurant_sale", {
 		item_id = dish, -- 售卖物品ID
 		restaurant_sale_seat = slot, -- 售卖物品所在位置
@@ -22,9 +22,12 @@ local function checkReward(role)
 		return false
 	end
 	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
+	local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
 	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
 	local nowItemTime = math.min(skynet.timex(), hangInfo.endItemTime or 0)
  
+	local expCoef, itemCoef = role.storeData:getHangDropCoef()
+
 	-- 此次挂机，其中翻倍时长占多少
 	local doubleTime = role.activity:getActHangDoubleTime(hangInfo.coinTime, nowCoinTime)
 	local normalTime = nowCoinTime - hangInfo.coinTime - doubleTime
@@ -38,10 +41,10 @@ local function checkReward(role)
 	hangInfo.itemTime = nowItemTime
  
 	local items = role:getProperty("hangBag")
-	coinCount = coinCount + coinDoubleCount
-	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * carbonData.money)
-	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * carbonData.exp)
-	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp)
+	coinCount = (coinCount + coinDoubleCount) * expCoef
+	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * expCarbonData.money)
+	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * expCarbonData.exp)
+	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * expCarbonData.playerExp)
  
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -58,7 +61,8 @@ local function checkReward(role)
  
 	-- 特权卡挂机额外栏位
 	local privExtraCnt = role.storeData:getHangSlotExtraCount()
-	local selfFC = role:getProperty("hangBagLimit") + privExtraCnt
+	--local selfFC = role:getProperty("hangBagLimit") + privExtraCnt
+	local selfFC = 50
 	local selfIC = selfFC * globalCsv.idle_field_limit
  
 	local function randomItem()
@@ -73,6 +77,7 @@ local function checkReward(role)
 				if cur[1] == ItemId.BreakCost and doubleTime > 0 then
 					cur[2] = cur[2] * 2
 				end
+				cur[2] = cur[2] * itemCoef
 				if (items[cur[1]] and math.ceil((items[cur[1]] + cur[2]) / globalCsv.idle_field_limit) > math.ceil(items[cur[1]] / globalCsv.idle_field_limit))
 						or not items[cur[1]] then	--要占用新栏位的情况
 					local addFC
@@ -139,6 +144,7 @@ function _M.startRpc( agent, data )
 	local hangInfo = role:getProperty("hangInfo")
 	local isNew = not hangInfo.carbonId
 	hangInfo.carbonId = carbonId
+	hangInfo.expCarbonId = isNew and carbonId or hangInfo.expCarbonId
 	local nowTime = skynet.timex()
 	if isNew then
 		hangInfo.coinTime = nowTime
@@ -149,23 +155,16 @@ function _M.startRpc( agent, data )
 		hangInfo.coinTime = math.min(nowTime, hangInfo.endCoinTime)
 		hangInfo.itemTime = math.min(nowTime, hangInfo.endItemTime)
 	end
+
+	role:pushMsg({type = "hang", time = math.min(hangInfo.endCoinTime - nowTime, hangInfo.endItemTime - nowTime)})
 	if not role:checkHangPass(carbonId) then
 		hangInfo.bossTime = nowTime + carbonData.idle_time
 	else
 		hangInfo.bossTime = nil
 	end
+
 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
-	-- 指定当前引导的步骤
-	if carbonId == 10101 then
-		role:saveGuide(5,11)
-	elseif carbonId == 10102 then
-		role:saveGuide(8,2)
-	elseif carbonId == 10103 then
-		role:saveGuide(9,2)
-	elseif carbonId == 10220 then
-		role:saveGuide(22,1)
-	end
 	role:mylog("hang_action", {desc = "startHang", int1 = carbonId})
 	SendPacket(actionCodes.Hang_startRpc, '')
 	return true
@@ -193,12 +192,12 @@ function _M.startBattleRpc(agent, data)
 		return 1
 	end
  
-	local hangInfo = role:getProperty("hangInfo")
-	if curData.main ~= 1 then
-		if carbonId ~= hangInfo.carbonId then 
-			return 2
-		end
-	end
+	--local hangInfo = role:getProperty("hangInfo") or {}
+	--if curData.main ~= 1 then
+	--	if carbonId ~= hangInfo.carbonId then 
+	--		return 2
+	--	end
+	--end
  
 	if role:checkHangPass(carbonId) then 
 		return 3
@@ -214,7 +213,7 @@ end
 function _M.endBattleRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
-	local hangInfo = role:getProperty("hangInfo")
+	local hangInfo = role:getProperty("hangInfo") or {}
 	if not msg.key or msg.key ~= _BattleKey then 
 		SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
@@ -225,11 +224,12 @@ function _M.endBattleRpc(agent, data)
 	if not carbonData then
 		return 2
 	end
-	if carbonData.main ~= 1 then
-		if carbonId ~= hangInfo.carbonId then 
-			return 3
-		end
-	end
+
+	--if carbonData.main ~= 1 then
+	--	if carbonId ~= hangInfo.carbonId then 
+	--		return 3
+	--	end
+	--end
  
 	if role:checkHangPass(carbonId) then 
 		return 4
@@ -255,12 +255,7 @@ function _M.endBattleRpc(agent, data)
  
 		-- 引导
 		if carbonId == 10101 then
-			role:finishGuide(5)
-		elseif carbonId == 10102 then
-			role:finishGuide(8)
-			role:saveGuide(9, 2)
-		elseif carbonId == 10103 then
-			role:finishGuide(9)
+			role:finishGuide(6)
 		elseif carbonId == 20101 then
 			role:finishGuide(22)
 		end
@@ -273,12 +268,12 @@ function _M.endBattleRpc(agent, data)
 	end
 	local nextCarbonId = role:getNextCarbonId(carbonId)
 	-- 设置挂机关卡
-	if isWin and hangInfo.carbonId < nextCarbonId then
-		hangInfo.carbonId = nextCarbonId
-		local cfg = csvdb["idle_battleCsv"][nextCarbonId]
-		if cfg then
-			hangInfo.bossTime = skynet.timex() + cfg.idle_time
-		end
+	if isWin then --and (hangInfo.carbonId or 0) < nextCarbonId then
+		hangInfo.expCarbonId = carbonId
+		--local cfg = csvdb["idle_battleCsv"][nextCarbonId]
+		--if cfg then
+		--	hangInfo.bossTime = skynet.timex() + cfg.idle_time
+		--end
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
@@ -334,7 +329,7 @@ function _M.roleFormatRpc(agent , data)
 	hangTeam.leader = msg.leader
 	hangTeam.supports = supports
 	role:saveHangTeam(hangTeam)
-	role:saveGuide(5,8)
+	role:finishGuide(5)
 	SendPacket(actionCodes.Hang_roleFormatRpc, '')
 	return true
 end
@@ -354,7 +349,9 @@ function _M.getRewardRpc(agent , data)
 	hangInfo.itemTime = nowTime
 	role:updateProperty({field = "hangBag", value = items})
 	role:updateProperty({field = "hangInfo", value = hangInfo})
-	role:checkTaskEnter("HangGet")
+	role:pushMsg({type = "hang", time = globalCsv.idle_producetime_max})
+	
+	role:checkTaskEnter("HangGet", {reward = reward})
 	if reward[ItemId.Gold] then
 		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
 	end
@@ -382,6 +379,7 @@ function _M.quickRpc(agent , data)
 	local hangInfo = role:getProperty("hangInfo")
 	if not hangInfo.carbonId then return end
 	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
+	local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  
 	local curCount = role.dailyData:getProperty("hangQC") + 1
 	local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
@@ -398,9 +396,9 @@ function _M.quickRpc(agent , data)
  
 	local coinCount = math.floor(time / globalCsv.idle_money_produce_cd)
 	local itemCount = math.floor(time / globalCsv.idle_item_produce_cd)
-	reward[ItemId.Gold] = math.floor((reward[ItemId.Gold] or 0) + coinCount * carbonData.money)
-	reward[ItemId.Exp] = math.floor((reward[ItemId.Exp] or 0) + coinCount * carbonData.exp)
-	reward[ItemId.PlayerExp] = math.floor((reward[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp)
+	reward[ItemId.Gold] = math.floor((reward[ItemId.Gold] or 0) + coinCount * expCarbonData.money)
+	reward[ItemId.Exp] = math.floor((reward[ItemId.Exp] or 0) + coinCount * expCarbonData.exp)
+	reward[ItemId.PlayerExp] = math.floor((reward[ItemId.PlayerExp] or 0) + coinCount * expCarbonData.playerExp)
  
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -490,8 +488,9 @@ function _M.buyBonusCountRpc(agent, data)
 	end
  
 	local bonusC = role.dailyData:getProperty("bonusC")
+	local extraCnt = role.storeData:getBonusExtraFightCount()
 	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
-	local lastCount = globalCsv.bonus_daily_buy_count * coef - bonusC[btype]["b"]
+	local lastCount = globalCsv.bonus_daily_buy_count * coef + extraCnt - bonusC[btype]["b"]
 	if math.illegalNum(count, 1, lastCount)  then return 1 end
  
 	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
@@ -531,12 +530,13 @@ function _M.startBonusBattleRpc(agent, data)
  
 	local actData = csvdb["activity_ctrlCsv"][actId]
  
+	local extraCnt = role.storeData:getBonusExtraFightCount()
 	local coef = 1
 	if open and actData then
 		coef = tonumber(actData.condition2)
 	end
  
-	if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 7 end
+	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] <= 0 then return 7 end
  
  
 	role.__bonusBattleCache = {
@@ -556,6 +556,7 @@ function _M.endBonusBattleRpc(agent, data)
 	if not role.__bonusBattleCache then return 1 end
 	local open, actId = role.activity:isOpen("BonusDouble")
 	local actData = csvdb["activity_ctrlCsv"][actId]
+	local extraCnt = role.storeData:getBonusExtraFightCount()
  
 	local coef = 1
 	if open and actData then
@@ -573,7 +574,7 @@ function _M.endBonusBattleRpc(agent, data)
  		-- 胜利扣除次数
  		local bonusC = role.dailyData:getProperty("bonusC")
 		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-		if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 3 end
+		if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] <= 0 then return 3 end
 		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
 		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
@@ -54,12 +54,11 @@ function _M.levelUpRpc( agent, data )
 		hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
 	})
  
-	if hero:getProperty("type") == 103 then
-		role:finishGuide(7)
-	end
 	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
  
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
+
+	role:checkTaskEnter("HeroLvlCollect", {})
 	SendPacket(actionCodes.Hero_levelUpRpc, '')
 	return true
 end
@@ -127,7 +126,13 @@ function _M.wakeRpc(agent, data)
 		hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 	})
  
+	if hero:getProperty("type") == 204 then
+		role:finishGuide(7)
+	end
+
 	SendPacket(actionCodes.Hero_wakeRpc, '')
+
+	role:checkTaskEnter("HeroStarCollect", {})
 	return true
 end
  
@@ -595,6 +600,8 @@ function _M.referRunesRpc(agent, data)
 			})
 		end
 	end
+
+	role:checkTaskEnter("RuneQualityCollect", {})
  
 	SendPacket(actionCodes.Hero_referRunesRpc, "")
 	return true
@@ -728,6 +735,13 @@ function _M.drawHeroRpc(agent, data)
 	if btype ~= 1 then
 		subType = 1
 	end
+
+	if btype == 1 then
+		-- 判断定向卡池活动开启
+		if not role.activity:isOpen("RaceDraw") then
+			return
+		end
+	end
  
 	local buildTypeData = csvdb["build_typeCsv"][btype]
 	if not buildTypeData then return 2 end
@@ -806,26 +820,44 @@ function _M.drawHeroRpc(agent, data)
 			end
 		end
  
-		for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
-			local pool_str = "pool_" .. poolId
-			if oneData[pool_str] and oneData[pool_str] ~= "" then
-				local itemData = csvdb["itemCsv"][itemId]
-				while itemData do
-					if itemData.type ~= ItemType.Hero then break end
-					local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
-					if not heroData then break end
-					local ok = true
-					-- 保底是全随机，不用比较类型
-					if not isFloorBack then
-						for idx, field in ipairs(condition) do
-							if heroData[field] ~= values[idx] then ok = false break end
+		local weight = 0
+		local up_pool = nil
+		local rand_v = math.randomInt(1, 100)
+		if values[1] == HeroQuality.SR then
+			weight = unitPool["up_sr_weight"]
+			up_pool = unitPool["up_sr_id"]
+		elseif values[1] == HeroQuality.SSR then
+			weight = unitPool["up_ssr_weight"]
+			up_pool = unitPool["up_ssr_id"]
+		end
+		--print(poolId, rand_v, weight, up_pool, values[1])
+		if rand_v < weight and up_pool then
+			up_pool = up_pool:toArray(true, "=")
+			for k, v in ipairs(up_pool) do
+				resultPool[v] = {1}
+			end
+		else
+			for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
+				local pool_str = "pool_" .. poolId
+				if oneData[pool_str] and oneData[pool_str] ~= "" then
+					local itemData = csvdb["itemCsv"][itemId]
+					while itemData do
+						if itemData.type ~= ItemType.Hero then break end
+						local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+						if not heroData then break end
+						local ok = true
+						-- 保底是全随机，不用比较类型
+						if not isFloorBack then
+							for idx, field in ipairs(condition) do
+								if heroData[field] ~= values[idx] then ok = false break end
+							end
 						end
+						if not ok then break end
+						if oneData[pool_str] > 0 then
+							resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
+						end
+						break
 					end
-					if not ok then break end
-					if oneData[pool_str] > 0 then
-						resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
-					end
-					break
 				end
 			end
 		end
@@ -833,9 +865,9 @@ function _M.drawHeroRpc(agent, data)
  
 	role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
  
-	local guideHero
-	if role:getProperty("newerGuide") == "11=1" then
-		guideHero = 613
+	local guideHero = nil
+	if role:getProperty("newerGuide") == "8=1" then
+		guideHero = globalCsv.newdraw_hero_item_id or 503
 	end
  
 	local ssrCount = 0
@@ -854,12 +886,16 @@ function _M.drawHeroRpc(agent, data)
 		local itemId = math.randWeight(resultPool, 1)
 		if guideHero then
 			itemId = guideHero
-			guideHero = nil
 		end
  
 		local itemData = csvdb["itemCsv"][itemId]
 		if itemData.quality == HeroQuality.SSR then
 			ssrCount = ssrCount + 1
+			if not guideHero then
+				-- 广播获得ssr英雄
+				local ntf = {heroId = itemData.id - ItemStartId.Hero, nick = role:getProperty("name")}
+				mcast_util.pub_world(actionCodes.Role_broadGetSSR, MsgPack.pack(ntf))
+			end
 		end
  
 		if itemData.quality >= HeroQuality.SR then
@@ -890,7 +926,7 @@ function _M.drawHeroRpc(agent, data)
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
 	end
-	role:finishGuide(11)
+	role:finishGuide(8)
  
 	role:log("gacha", {
 		gacha_id = poolId, -- 卡池ID
@@ -910,7 +946,28 @@ function _M.drawHeroRpc(agent, data)
 		local drawCardReward, val = role:getDrawCardExtraReward(oldVal, newVal)
 		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
 		if drawCardReward == "" then
-			local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+			local repayHeroMaxCount = role:getProperty("repayMaxC") or 0
+			repayHeroMaxCount = repayHeroMaxCount + 1
+
+			role:updateProperty({field = "repayMaxC", value = repayHeroMaxCount})
+			local even = repayHeroMaxCount % 2
+			local id = 0
+			if even == 1 then
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+			else
+				local giftHeroSet = {}
+				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
+					if cfg["pool_1"] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
+						giftHeroSet[gid] = {1}
+					end
+				end
+				if next(giftHeroSet) then
+					id = math.randWeight(giftHeroSet, 1)
+				end
+			end
+			if id == 0 then
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+			end
  
 			local r,change = {}
 			local itemData = csvdb["itemCsv"][id]
@@ -925,8 +982,9 @@ function _M.drawHeroRpc(agent, data)
 			--end
 			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 		elseif drawCardReward and drawCardReward ~= "" then
-			role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
-			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack({reward = drawCardReward:toNumMap()}))
+			local r,change = {}
+			r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 		end
 		role:updateProperty({field = "repayHero", value = val})
 	end
@@ -1010,4 +1068,4 @@ function _M.changeCrown(agent, data)
 	return true
 end
  
-return _M
 \ No newline at end of file
+return _M
@@ -121,6 +121,9 @@ function _M.loginRpc( agent, data )
 			role:setProperty("device", device)
 		end
 	end
+	if msg.token then
+		role._pushToken = msg.token
+	end
  
 	if not msg.isGMlogin then
 		local banTime = role:getProperty("banTime")
@@ -261,7 +264,8 @@ function _M.loginRpc( agent, data )
  
 	-- 发下缓存的世界消息
 	local worldChatResponse = {worldChats = {}}
-	local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
+	-- local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
+	local ok, msgs = true, {}
 	if not ok then 
 		msgs = {} 
 	end
@@ -550,7 +554,7 @@ function _M.openTimeBoxRpc(agent, data)
 		if boxL[slot] then return end
 		role:costItems({[itemId] = 1}, {log = {desc = "openTimeBox"}})
 		boxL[slot] = {id = itemId, time = skynet.timex() + randomData.openTime}
-
+		role:pushMsg({type = "box", slot = slot, time = randomData.openTime})
 	elseif oper == 2 then -- 领取
 		local quick = msg.quick
 		if not boxL[slot] then return end
@@ -561,6 +565,7 @@ function _M.openTimeBoxRpc(agent, data)
 			costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
 			if not role:checkItemEnough({[ItemId.BoxKey] = costKey}) then return end
 			role:costItems({[ItemId.BoxKey] = costKey}, {log = {desc = "openTimeBox"}})
+			role:pushCancel({type = "box", slot = slot})
 		end
 		local boxId = boxL[slot].id
 		local itemData = csvdb["itemCsv"][boxId]
@@ -615,52 +620,57 @@ end
 function _M.openSpeedUpBoxRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
-
-	local id = msg.id
-	local count = msg.count
-	local itemData = csvdb["itemCsv"][id]
-	if not itemData or itemData.type ~= ItemType.SpeedBox then return end
-
-	if math.illegalNum(count, 1, role:getItemCount(id)) then return end
-	local useType, hour = table.unpack(itemData.use_effect:toArray(true, "="))
-	local time = hour * 60 * 60
+	local itemInfo = msg.itemInfo
  
 	local reward = {}
-	if useType == 1 then -- 挂机齿轮
-		local hangInfo = role:getProperty("hangInfo")
-		if not hangInfo.carbonId then
-			return
-		end
-		local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
-		reward[ItemId.Gold] = math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.money * count
-	elseif useType == 2 then -- 挂机经验
-		local hangInfo = role:getProperty("hangInfo")
-		if not hangInfo.carbonId then
-			return
-		end
-		local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
-		reward[ItemId.Exp] = math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.exp * count
-	elseif useType == 3 then  -- 食材商人收入
-		local buildType = 6
-		local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
-		local buildingData = csvdb["diner_buildingCsv"][buildType][level]
-		if not buildingData then
-			return 1
-		end
-		local gfood = role.dinerData:getProperty("gfood")
-		if not next(gfood) then return end
-		for k , v in pairs(gfood) do
-			local itemId = v.id
-			local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
-			reward[itemId] = math.floor(time / speed) * count
+	for i = 1, #itemInfo do
+		local pair = itemInfo[i]
+		local id = pair[1]
+		local count = pair[2]
+		local itemData = csvdb["itemCsv"][id]
+		if not itemData or itemData.type ~= ItemType.SpeedBox then return end
+
+		if math.illegalNum(count, 1, role:getItemCount(id)) then return 1 end
+		local useType, hour = table.unpack(itemData.use_effect:toArray(true, "="))
+		local time = hour * 60 * 60
+
+		if useType == 1 then -- 挂机齿轮
+			local hangInfo = role:getProperty("hangInfo")
+			if not hangInfo.expCarbonId then
+				return 2
+			end
+			local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+			reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.money * count
+		elseif useType == 2 then -- 挂机经验
+			local hangInfo = role:getProperty("hangInfo")
+			if not hangInfo.expCarbonId then
+				return 3
+			end
+			local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+			reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.exp * count
+		elseif useType == 3 then  -- 食材商人收入
+			local buildType = 6
+			local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
+			local buildingData = csvdb["diner_buildingCsv"][buildType][level]
+			if not buildingData then
+				return 4
+			end
+			local gfood = role.dinerData:getProperty("gfood")
+			if not next(gfood) then return 5 end
+			for k , v in pairs(gfood) do
+				local itemId = v.id
+				local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
+				reward[itemId] = (reward[itemId] or 0) + math.floor((time / speed) * count)
+			end
+		else
+			return 6
 		end
-	else
-		return
+
+		role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
 	end
  
-	role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
 	local change
-	reward, change = role:award(reward, {log = {desc = "speedUpBox"}, int1 = id, int2 = count})
+	reward, change = role:award(reward, {log = {desc = "speedUpBox"}})
  
 	SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -671,17 +681,18 @@ function _M.storyBookRewardRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local storyId = msg.id
 	local storyBookData = csvdb["story_bookCsv"][storyId]
-	if not storyBookData then return end
+	if not storyBookData then return 1 end
 	local storyStatus = role:getProperty("storyB")
  
 	local status = (storyStatus[storyId] or {}).s
  
-	if status == -1 then return end
+	if status == -1 then return 2 end
  
 	if not status or status ~= 1 then 
-		if storyBookData.unlockType == 1 and (role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) or storyId == 1 or storyId == 2) then  -- 挂机剧情正在挂机也可以领奖
+		--if storyBookData.unlockType == 1 and (role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) or storyId == 1 or storyId == 2) then  -- 挂机剧情正在挂机也可以领奖
+		if storyBookData.unlockType == 1 then  -- 挂机剧情正在挂机也可以领奖
 		else
-			return 
+			return 3
 		end
 	end
 	-- 获取奖励
@@ -936,7 +947,7 @@ function _M.chatRpc(agent, data)
 				end
 			end
 			mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
-			pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
+			-- pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
 			role:mylog("role_action", {desc = "chatWorld", text1 = content})
 		end,
 		-- 私聊
@@ -1226,7 +1237,7 @@ function _M.useSelectItemRpc(agent, data)
 	local count = msg.count
 	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
 	local itemData = csvdb["itemCsv"][itemId]
-	if itemData.type ~= ItemType.SelectItemBox then return end
+	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end
 	local itemMap = itemData.use_effect:toNumMap()
 	local reward, change = {}
 	for k, v in pairs(itemMap) do
@@ -3,7 +3,20 @@ local _M = {}
 local serverId = tonumber(skynet.getenv("servId"))
 local md5 = require "md5"
  
-local function makeOrder(roleId, rechargeId)
+local function makeOrder(role, rechargeId)
+	local roleId = role:getProperty("id")
+	local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
+	if not rechargeData then
+		skynet.error("recharge id not exist", rechargeId)
+		return ""
+	end
+	local limit = rechargeData.limit
+    local rechargeRecord = role:getProperty("payR") or {}
+    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
+        skynet.error(string.format("recharge id:%d count over limit, user id:%d", rechargeId, roleId))
+        return ""
+    end
+
 	local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
 	local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
 	local orderKey = string.format("order:%d:%d", roleId, orderId)
@@ -29,7 +42,7 @@ function _M.rechargeRpc(agent , data)
 	local roleId = role:getProperty("id")
  
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = makeOrder(role, id)
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
  
  
@@ -78,7 +91,7 @@ function _M.googleRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = makeOrder(role, id)
 	-- 签名
 	local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
 	local need = {
@@ -105,7 +118,7 @@ function _M.myCardRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = makeOrder(role, id)
 	-- 签名
 	local secret_key = "48759e07540f46d9af17ec82669b4272"
 	local need = {
@@ -131,7 +144,7 @@ function _M.iosRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = makeOrder(role, id)
 	-- 签名
 	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
 	local need = {
@@ -62,7 +62,7 @@ function _M.startBattleRpc(agent, data)
  
 	if not csvdb["tower_battleCsv"][id] then return end
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
-	if curCount < 1 then return end -- 没有次数返回
+	--if curCount < 1 then return end -- 没有次数返回
  
 	--搞起来
 	towerInfo.c = curCount - 1
@@ -136,10 +136,15 @@ end
  
 function _M.bugCountRpc(agent, data)
 	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local buyCount = msg.count
  
 	local towerInfo = role:getProperty("towerInfo")
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
 	local needCount = globalCsv.tower_count_limit - curCount
+	if needCount > buyCount then
+		needCount = buyCount
+	end
 	if needCount > 0 then -- 补充
 		local cost = globalCsv.tower_chance_item:toNumMap()
 		for k , v in pairs(cost) do
@@ -147,7 +152,7 @@ function _M.bugCountRpc(agent, data)
 		end
 		if not role:checkItemEnough(cost) then return end
 		role:costItems(cost, {log = {desc = "towerCount"}})
-		curCount = globalCsv.tower_count_limit
+		curCount = curCount + needCount
 	end
 	towerInfo.c = curCount
 	towerInfo.t = nextTime
@@ -51,6 +51,7 @@ function Adv:initByInfo(advInfo)
 	self.cacheUnlock = advInfo.cacheUnlock or {}
 	self.shopStatus = advInfo.shopStatus or {}
 	self.support = advInfo.support or {}
+	self.logid = advInfo.logid or "auto"
  
 	self.maps = {}
 	for id, map in ipairs(advInfo.maps or {}) do
@@ -102,6 +103,7 @@ function Adv:initByChapter(params)
 	self.shopStatus = self.shopStatus or {}
 	self.support = self.support or {}
 	self.battle = nil  -- 清掉 老的 battle
+	self.logid = self.owner:getActionUcode()
  
 	if isEnter then -- 把 支援效果初始化为易用用的形式
 		self:initSupport(support or {})
@@ -206,6 +208,7 @@ function Adv:saveDB(notNotify)
 		advInfo.cacheUnlock = self.cacheUnlock
 		advInfo.shopStatus = self.shopStatus
 		advInfo.support = self.support
+		advInfo.logid = self.logid
 		advInfo.maps = {}
  
 		self.battle:saveDB()
@@ -610,6 +613,15 @@ function Adv:wearArtifact(slot, id)
 		id = nil
 	end
 	self:mylog({desc = "wearArtifact", int1 = id})
+	self.owner:log("mission_pick_equip", {
+		mission_threadid = self.chapterId, -- 大地图ID
+		mission_threadname = (csvdb["adv_chapterCsv"][self.chapterId] or {})["chapter"] or "auto", -- 大地图名称
+		mission_id = self.level, -- 关卡ID
+		mission_pick_equip_type = 1, --神器操作类型：1:装备，2:卸下
+		mission_pick_equip_id = id, --神器ID
+		mission_pick_equip_lv = advAFGet[id], --神器等级
+		mission_sequenceid = self.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	})
  
 	self.owner:changeUpdates({{type = "advAFWear", field = slot, value = id}})
 	return true
@@ -670,7 +682,6 @@ function Adv:artifactLevelUp(id, level)
  
 	self:mylog({desc = "artifactLevelUp", int1 = id, int2 = level})
  
-
 	local status = 0
 	if curWear[id] then -- 穿着呢
 		local oldData = csvdb["adv_artifactCsv"][id][advAFGet[id]]
@@ -815,6 +826,49 @@ function Adv:over(success, rewardRatio, overType)
  
 	self:mylog({desc = "over", short1 = success and 1 or 0, int1 = overType})
  
+
+	local team = self.owner:getProperty("advTeam")
+	local player = {}
+	local attrs = self.owner:getTeamBattleInfo(team).heros
+	for attrName, _ in pairs(AdvAttsEnum) do
+		for _, hero in pairs(attrs) do
+			player[attrName] = (player[attrName] or 0) + hero[attrName]
+		end
+		player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
+	end
+
+	local battleV = 1 * player["hp"]
+		+ 2 * player["atk"]
+		+ 1.25 * player["def"]
+		+ 0.226 * player["hit"]
+		+ 0.26 * player["miss"]
+
+	local heroList = {team.leader, team.leader2}
+	for _, hid in pairs(team.heros) do
+		if hid ~= team.leader and hid ~= team.leader2 then
+			heroList[#heroList + 1] = hid
+		end
+	end
+
+	self.owner:log("mission_pick", {
+		mission_threadid = self.chapterId, -- 大地图ID
+		mission_threadname = (csvdb["adv_chapterCsv"][self.chapterId] or {})["chapter"] or "auto", -- 大地图名称
+		mission_id = self.level, -- 关卡ID
+		mission_herolist = heroList, -- 英雄ID列表，[111, 222, 333, 444, 555] 前两个为队长、副队长
+		mission_heroscore = battleV, -- 编队总评分
+		mission_teamlv = 0, -- 编队等级
+		mission_recscore = csvdb["adv_chapter_campsiteCsv"][self.chapterId][1].recommendValue, -- 关卡推荐评分
+		mission_floor_bef = 0, -- 进入前关卡层数
+		mission_floor_aft = self.level, -- 结束时关卡层数
+		mission_team_status = {HP = team.player.hp, SP = team.player.sp}, -- 队伍状态，{"HP":100, "SP":100, "curse":7}
+		mission_result = success and 1 or (team.player.hp > 0 and 3 or 2), -- 战斗结果(0-无效，1-胜利，2-血量耗尽退出，3，主动退出)
+		mission_reward = reward, -- 获得奖励，[{"id":101,"num":10},{"id":102,"num":20},{"id":103,"num":30}]
+		mission_integral_bef = 0, -- 进入前积分
+		mission_integral_aft = score, -- 完成后积分
+		mission_cleartype = 1, -- 1正常通关;2代理拾荒
+		mission_sequenceid = self.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	})
+
 	local chapterId = self.chapterId
 	self:clear()
 	self.owner:checkTaskEnter("AdvScore", {score = score})
@@ -76,6 +76,7 @@ function Battle:initPlayer()
 		end
 		player.exp = 0
 		player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100)
+		player.spMax = player.sp
 		player.growth = {}
 		player.passives = {}
  
@@ -576,6 +576,9 @@ end
  
 function Buff:effect()
 	self:decCount()
+	if self.buffData.show:sismember(2, " ") then
+		self.owner.battle.adv:pushBackEvent(AdvBackEventType.BuffEffect, {etype = 2})
+	end
 	if self._effectValue then
 		return self:_effectValue()
 	end
@@ -120,7 +120,7 @@ Passive.GET_BUFF = 28 --获得指定buff
 Passive.OPEN_BLOCK = 29 --翻开格子
 Passive.OPEN_MONSTER = 30 --翻开怪物
 Passive.PLAYER_BUFF = 31 --玩家获得buff
-
+Passive.PLAYER_BUFF_CLASSIFY = 35 -- 获得指定标签的buff
  
 -- 不同的开启条件
 local PassiveCondFactory = {}
@@ -183,6 +183,14 @@ PassiveCondFactory[Passive.GET_BUFF] = function(_Passive)
 end
 PassiveCondFactory[Passive.PLAYER_BUFF] = PassiveCondFactory[Passive.GET_BUFF]
  
+PassiveCondFactory[Passive.PLAYER_BUFF_CLASSIFY] = function(_Passive)
+	_Passive._trigger = function(self, params)
+		if params.classify:sismember(self.passiveData.value) then
+			return true
+		end
+	end
+end
+
  
 PassiveCondFactory[Passive.BORN_ONCE] = function(_Passive)
 	_Passive._afterRound = function(self)
@@ -163,7 +163,8 @@ function BaseObject:addBuff(buffId, releaser)
 		table.insert(self.buffs, buff)
 		buff:createAfter()
 	end
-	self:triggerPassive(Passive.GET_BUFF, {buffId = buffId})
+	self:triggerPassive(Passive.GET_BUFF, {trigger = releaser, buffId = buffId})
+	self:triggerPassive(Passive.PLAYER_BUFF_CLASSIFY, {trigger = releaser, classify = buffData.classify})
 	return true
 end
  
@@ -670,7 +671,7 @@ function Player:effectBattleBuff()
 	for _, buff in ipairs(self.buffs) do
 		if not buff:isHide() and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
 			buff:effect()
-			if not buff.buffData.classify:sismember(7, " ") then -- 神器buff 不会清除
+			if not buff.buffData.classify:sismember(7, " ") and not buff.buffData.classify:sismember(8, " ") then -- 神器buff 不会清除 队长技
 				buff:uncover()
 			end
 		end
@@ -699,6 +700,10 @@ function Player:addBuff(buffId, releaser)
 		self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId)
 		self.battle.adv:pushBackEvent(AdvBackEventType.Buff, {buffId = buffId})
 		self.battle:triggerPassive(Passive.PLAYER_BUFF, {buffId = buffId})
+		local buffData = csvdb["adv_map_buffCsv"][buffId]
+		if buffData and buffData.show:sismember(1, " ") then
+			self.battle.adv:pushBackEvent(AdvBackEventType.BuffEffect, {etype = 1})
+		end
 	end
 	return status
 end
@@ -29,12 +29,6 @@ _codeSession = {}
 --- {{{ 定时器相关
 local function handle_timeout()
 	if not agentInfo.open_timer then return end
-
-	if not agentInfo.role then
-		skynet.timeout(100, handle_timeout)
-		return
-	end
-
 	agent_util:update(agentInfo)
 	skynet.timeout(100, handle_timeout)
 end
@@ -274,6 +268,8 @@ function CMD.start(session, source, gate, fd, ip, hotfixs)
 		end
 	end
  
+	start_agent_timer()
+
 	-- 这里将消息伪装成 watchdog 发出，这样就由 A->B->C->B->A 变成 A->B->C->A
 	skynet.redirect(gate, source, "lua", session, skynet.pack("forward", fd, 0, skynet.self()))
 end
-Subproject commit 9bb26cfdb11f81dbfe6abbc468b44ca9f814deb2
+Subproject commit 02a9bbbb10bb99a91cc5d67f62dc7e5b49d8cb46
 local skynet = require "skynet"
  
 local max_client = tonumber(skynet.getenv("max_client"))
+local max_queue = tonumber(skynet.getenv("max_queue"))
  
 skynet.start(function()
 	print("Server start")
@@ -11,7 +12,7 @@ skynet.start(function()
  
 	skynet.call(watchdog, "lua", "start", {
 		port = tonumber(skynet.getenv("server_port")),
-		maxclient = max_client,
+		maxclient = max_client + max_queue + 10,
 		httpd = httpd,
  
 		redishost = skynet.getenv("redis_host"),
@@ -18,6 +18,7 @@ Activity.ActivityType = {
 	DrawHero = 12,	--抽卡周 招募
 	AdvDraw = 13,	--拾荒抽周 资助
 	OpenBox = 14,	--拆解周 时钟箱
+	RaceDraw = 16,  -- 定向招募活动
 }
  
  
@@ -344,8 +345,18 @@ activityFunc[Activity.ActivityType.PaySignIn] = {
 	["init"] = function(self, actType, isCrossDay, notify)
 		self:updateActData(actType, {}, not notify)
 	end,
-	-- ["close"] = function(self, actType, notify)
-	-- end,
+	["close"] = function(self, actType, notify)
+		self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
+		
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.PaySignCard then
+				rechargeRecord[id] = nil
+				break
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
+	end,
 }
  
 -- 充值反馈
@@ -367,6 +378,37 @@ activityFunc[Activity.ActivityType.PayBack] = {
 	-- end,
 }
  
+-- 英雄帖
+activityFunc[Activity.ActivityType.CalendaTask] = {
+	["init"] = function(self, actType, isCrossDay, notify)
+		local calTask = self.owner:getProperty("CalTask")
+		calTask = {}
+		local role = self.owner
+		local buildL = role.dinerData:getProperty("buildL")
+		local curLevel = buildL:getv(1, 1)
+		role:checkTaskEnter("DinerLevelUp", {level = curLevel})
+
+		role:checkTaskEnter("HeroLvlCollect", {})
+		role:checkTaskEnter("HeroQualityCollect", {})
+
+		local curPopular = role.dinerData:getProperty("popular")
+		role:checkTaskEnter("DinerPopular", {count = curPopular})
+
+		local rLevel = role:getProperty("level")
+		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
+
+		local towerInfo = role:getProperty("towerInfo")
+		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+		--"PvpWin"
+		role:checkTaskEnter("HangPass", {})
+		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("RuneQualityCollect", {})
+
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+}
+
 function Activity:initActivity(actId, isCrossDay, notify)
 	local actData = csvdb["activity_ctrlCsv"][actId]
 	if not actData then return end
@@ -298,6 +298,9 @@ function Diner:expediteSell(slot)
 		self:checkDinerTask(DinerTask.SellDishType, expediteCount, math.ceil(sell.dish / 100))
 		self:checkDinerTask(DinerTask.SellDishRare, expediteCount, dishData.rarity)
 		self.owner:checkTaskEnter("FoodSell", {count = expediteCount})
+
+		local needTime = sells[slot].count * dishData.sell_time + sells[slot].time - skynet.timex()
+		self.owner:pushMsg({type = "food", slot = slot, time = needTime})
 	end
 	return {
 		expediteCount = expediteCount,
@@ -109,4 +109,8 @@ function Hero:getCamp()
     return csvdb["unitCsv"][self:getProperty("type")].camp
 end
  
+function Hero:getRare()
+    return csvdb["unitCsv"][self:getProperty("type")].rare
+end
+
 return Hero
 \ No newline at end of file
@@ -27,6 +27,7 @@ function Role:ctor( properties )
 	self.runeBag = {}
 	self.advData = nil
 	self.activity = nil
+	self._pushToken = nil
 	self.advElChapter = tonum(redisproxy:hget("adv_season", "chapter"), globalCsv.adv_endless_default_chapter) -- 无尽模式记录的赛季对应章节
 	self.advOverTime = tonum(redisproxy:hget("adv_season", "overTime")) -- 无尽模式关闭时间戳
 	if self.advOverTime == 0 then
@@ -111,6 +112,7 @@ Role.schema = {
 	hangBag				= {"table", {}},	-- 背包
 	hangBagLimit 		= {"number", globalCsv.idle_field_origin}, --背包上限
 	bTeam				= {"table", {}}, -- 奖励副本队伍
+	heroFormate			= {"table", {}},	-- 自选编队	 {adv={}, hang={}}
  
 	--引导相关
 	newerGuide 			= {"string","1=1"}, -- 新手引导 master=slave
@@ -161,6 +163,7 @@ Role.schema = {
 	emailSync			= {"number", 0}, -- 已经同步到的邮件Id
  
 	repayHero			= {"number", 0}, -- 招募次数 (除去友情招募)
+	repayMaxC			= {"number", 0}, -- 招募保底英雄领取次数 100一次
 	floorHero			= {"table", {}}, -- 招募保底 -- {[poolId] = count}
 	ssrUp				= {"table", {}}, -- ssr up -- {[poolId] = count}
 	newerDraw			= {"table", {}}, -- 新手池子 {N, 1} 抽了多少次, 是否出了ssr
@@ -174,6 +177,8 @@ Role.schema = {
  
 	downCvR				= {"number", 0}, -- 下载cv扩展包奖励 
 	feedback			= {"table", {}}, -- 反馈相关信息  {flag = false, count = 0} 	flag是否评论过，count 提示次数
+
+	calTask				= {"table", {}}, -- 英雄令活动 日历任务活动
 }
  
  
@@ -395,6 +400,7 @@ function Role:data()
 		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
 		feedback = self:getProperty("feedback"),
 		ctime = self:getProperty("ctime"),
+		calTask = self:getProperty("calTask"),
 	}
 end
  
@@ -287,7 +287,7 @@ end
  
 function CMD.friendBattleInfo(roleId)
 	local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"})
-	return next(info.pvpTBC) and info.pvpTBC or info.hangTB
+	return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB
 end
  
 function CMD.pvpCInfo(roleId)
@@ -81,6 +81,7 @@ local ItemReason = {
 	birth = 1006, -- 出生奖励
 	actSign = 1007, -- 活动签到
 	actPaySign = 1008, -- 活动付费签到
+	calendaTask = 1009,	-- 英雄帖
  
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -421,6 +422,79 @@ local MethodType = {
 		gift_name = true, -- 礼包名称
 		gift_reason = true, -- 礼包发放原因，见发放原因枚举表
 	},
+
+	push_gift = { -- 礼包推送
+		gift_id = true,	--礼包ID
+		gift_name = true,	--礼包名称
+	},
+
+	mission_pick = { --拾荒玩法
+		mission_threadid = true, -- 大地图ID
+		mission_threadname = true, -- 大地图名称
+		mission_id = true, -- 关卡ID
+		mission_herolist = "json", -- 英雄ID列表，[111, 222, 333, 444, 555] 前两个为队长、副队长
+		mission_heroscore = true, -- 编队总评分
+		mission_teamlv = true, -- 编队等级
+		mission_recscore = true, -- 关卡推荐评分
+		mission_floor_bef = true, -- 进入前关卡层数
+		mission_floor_aft = true, -- 结束时关卡层数
+		mission_team_status = "json", -- 队伍状态，{"HP":100, "SP":100, "curse":7}
+		mission_result = true, -- 战斗结果(0-无效，1-胜利，2-血量耗尽退出，3，主动退出)
+		mission_reward = "json", -- 获得奖励，[{"id":101,"num":10},{"id":102,"num":20},{"id":103,"num":30}]
+		mission_integral_bef = true, -- 进入前积分
+		mission_integral_aft = true, -- 完成后积分
+		mission_cleartype = true, -- 1正常通关;2代理拾荒
+		mission_sequenceid = true, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	},
+
+	mission_pick_achiev = { --拾荒任务
+		mission_threadid = true, -- 大地图ID
+		mission_threadname = true, -- 大地图名称
+		mission_id = true, -- 关卡ID
+		mission_pick_achiev_id = true, -- 任务ID
+		mission_pick_achiev_reward = "json", -- 任务奖励，[{"id":101,"num":10},{"id":102,"num":20},{"id":103,"num":30}]
+		mission_sequenceid = true, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	},
+	
+	mission_pick_equip = { -- 拾荒神器装备
+		mission_threadid = true, --大地图ID
+		mission_threadname = true, --大地图名称
+		mission_id = true, --关卡ID
+		mission_pick_equip_type = true, --神器操作类型：1:装备，2:卸下
+		mission_pick_equip_id = true, --神器ID
+		mission_pick_equip_lv = true, --神器等级
+		mission_sequenceid = true, --本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	},
+
+	mission_pick_reform = { --拾荒神器升级
+		mission_threadid = true, -- 大地图ID
+		mission_threadname = true, -- 大地图名称
+		mission_id = true, -- 关卡ID
+		mission_pick_equip_id = true, -- 神器ID
+		mission_pick_reform_beflv = true, -- 神器原等级
+		mission_pick_reform_aftlv = true, -- 神器现等级
+		mission_pick_reform_cost = true, -- 消耗探险点数
+		mission_sequenceid = true, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	},
+
+	mission_pick_use = { --拾荒任务道具使用
+		mission_threadid = true, -- 大地图ID
+		mission_threadname = true, -- 大地图名称
+		mission_id = true, -- 关卡ID
+		item_id = true, -- 道具ID
+		mission_pick_use_num = true, -- 道具使用量
+		mission_sequenceid = true, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	},
+
+	mission_pick_fund = { --拾荒资助
+		item_id = true, -- 资助花费道具ID
+		mission_pick_fund_amount = true, -- 资助花费道具数量
+		mission_pick_fund_cnt = true, -- 资助花费道具次数，1或者10
+		mission_pick_fund_reward = "json", -- 资助获得奖励，[{"id":100,"num":10},{"id":101,"num":20},{"id":102,"num":30}]
+		mission_pick_fund_stagereward = "json", -- 资助阶段奖励
+		mission_pick_fund_beflv = true, -- 资助前资助等级
+		mission_pick_fund_aftlv = true, -- 资助后资助等级
+	},
 }
  
 local function printError(info)
@@ -452,7 +452,12 @@ function RolePlugin.bind(Role)
 		newHero.owner = self
 		newHero:saveBattleValue()
 		self.heros[heroId] = newHero
-		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job}, params.notNotify)
+		local ssrCount = 0
+		if unitData.rare == HeroQuality.SSR then
+			ssrCount = self:getSSRHeroCount()
+		end
+		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
+		self:checkTaskEnter("HeroQualityCollect", {})
 		if not params.notNotify then
 			local heroResponse = {}
 			table.insert(heroResponse, newHero:data())
@@ -485,6 +490,16 @@ function RolePlugin.bind(Role)
 		end
 	end
  
+	function Role:getSSRHeroCount()
+		local count = 0
+		for _, hero in pairs(self.heros) do
+			if hero:getRare() == HeroQuality.SSR then
+				count = count + 1
+			end
+		end
+		return count
+	end
+
  
 	function Role:loadHeros()
 		local roleId = self:getProperty("id")
@@ -1174,6 +1189,7 @@ function RolePlugin.bind(Role)
 	function Role:addAdvLvExp(exp)
 		local advL = self:getProperty("advL")
 		local level = advL[1]
+		local oldLevel = level
 		local newExp = (advL[2] or 0) + exp
  
 		if not csvdb["adv_level_fundCsv"][level + 1] then
@@ -1181,7 +1197,8 @@ function RolePlugin.bind(Role)
 		end
  
 		while newExp >= csvdb["adv_level_fundCsv"][level].exp do
-			if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
+			--if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
+			if csvdb["adv_level_fundCsv"][level + 1] then -- 有下一级
 				newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
 				level = level + 1
 			else
@@ -1195,6 +1212,7 @@ function RolePlugin.bind(Role)
 		advL[1] = level
 		advL[2] = newExp
 		self:updateProperty({field = "advL", value = advL})
+		return oldLevel, level
 	end
  
 	function Role:getAdvWheelSurfLv(ptype)
@@ -1742,7 +1760,36 @@ function RolePlugin.bind(Role)
 		end)
 		return gift, checkPoint
 	end
+	--[[
+	"hang" : "挂机资源满",
+	"box" : "箱子拆解完毕",
+	"food" : "食物出售完毕",
+	"adv" : "代理拾荒完毕",
+	--]]
+	function Role:pushMsg(params)
+		if not self._pushToken or self._pushToken == "" then return end
+		if params.time <= 0 then
+			self:pushCancel(params)
+			return
+		end
+		local content = string.format("push:%d:%s:%s:%s", self:getProperty("id"), params.type, params.slot or 1, self._pushToken)
+		notifyClient({content = content, time = math.floor(params.time)})
+	end
  
+	function Role:pushCancel(params)
+		if not self._pushToken or self._pushToken == "" then return end
+		local content = string.format("push:%d:%s:%s:%s", self:getProperty("id"), params.type, params.slot or 1, self._pushToken)
+		deleteNotify({content = content})
+	end
+
+	function Role:pushCancelAll(ptype)
+		if not self._pushToken or self._pushToken == "" then return end
+		local pattern = string.format("push:%d:*", self:getProperty("id"))
+		if ptype then
+			pattern = string.format("push:%d:%s:*", self:getProperty("id"), ptype)
+		end
+		deleteNotify({pattern = pattern})
+	end
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -235,6 +235,8 @@ local StoreListener = {
 		[TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}},
 		[TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}},
 		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
+		[TaskType.AdvPass] = {{TriggerEventType.AdvPass, f("id")}},
+		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
 	}
 }
  
@@ -243,7 +245,7 @@ local CalendaTaskListener = {
 	listen = {
 		[TaskType.DrawHero] = {{1, 1, f("count")}},
 		[TaskType.BonusPass]= {{2, 1}},
-		[TaskType.AdvPass]= {{3, 1}},
+		[TaskType.AdvStart]= {{3, 1}},
 		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
 		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
 		[TaskType.AdvHang]= {{6, 1}},			----
@@ -255,11 +257,11 @@ local CalendaTaskListener = {
 		[TaskType.RoleLevelUp]= {{12, 2, f("level")}},
 		[TaskType.TowerPass]= {{13, 2, f("level")}},
 		[TaskType.HeroTalent]= {{14, 1}},
-		[TaskType.HangPass]= {{15, 2, f("id")}},
+		[TaskType.HangPass]= {{15, 3}},
 		[TaskType.HeroStarCollect]= {{16, 3}},
 		[TaskType.FoodSell]= {{17, 1, f("count")}},
 		[TaskType.HangGet]= {{18, 3, f("reward")}},
-		[TaskType.RuneQualityCollect]= {{19, 3, f("id")}},
+		[TaskType.RuneQualityCollect]= {{19, 3}},
 		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
 	}
 }
@@ -272,6 +274,7 @@ local TaskListeners = {
 	SudokuListener,
 	ActivityListener,
 	StoreListener,
+	CalendaTaskListener,
 }
  
 local RoleTask = {}
@@ -579,14 +582,18 @@ function RoleTask.bind(Role)
 	end
  
 	function Role:checkActivityTask(notNotify, activityType, ...)
+		if not self.activity then return end
 		self.activity:checkActivity(notNotify, activityType, ...)
 	end
  
 	function Role:checkStoreTask(notNotify, triggerType, param)
+		if not self.storeData then return end
 		self.storeData:OnTriggerLimitTimePack(triggerType, param)
 	end
  
 	function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2)
+		--print("check calenda taskl", mainType, subType, param1, param2)
+		if not self.activity then return end
 		local open, actId = self.activity:isOpen("CalendaTask")
 		local actData = csvdb["activity_ctrlCsv"][actId]
 		if not actData then return end
@@ -606,11 +613,86 @@ function RoleTask.bind(Role)
 						elseif subType == 2 then	-- 直接赋值
 							calTask[id] = param1
 						elseif subType == 3 then	-- 自定义类型
+							if cfg.type == 7 then	-- 英雄品质收集进度
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									local unitData = csvdb["unitCsv"][hero:getProperty("type")]
+									if unitData then
+										if cfg.condition2 <= unitData.rare then
+											count = count + 1
+										end
+									end
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
+							elseif cfg.type == 5 then	-- 英雄等级收集进度
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									if cfg.condition2 <= hero:getProperty("level") then
+										count = count + 1
+									end
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
+							elseif cfg.type == 16 then	-- 英雄星级收集进度
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									if cfg.condition2 <= hero:getProperty("wakeL") then
+										count = count + 1
+									end
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
+							elseif cfg.type == 18 then	-- 挂机累计收获id,y个
+								for rid, v in pairs(param1) do
+									if cfg.condition2 == rid then
+										calTask[id] = (calTask[id] or 0) + v
+									end
+								end
+							elseif cfg.type == 19 then	-- x名英雄装备y品质以上符文套装
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									local rcount = 0
+									for _,uid in pairs(hero:getRunes()) do
+										if uid > 0 then
+											local runeData = self.runeBag[uid]
+											if runeData then 
+												local csvData = csvdb["runeCsv"][runeData:getProperty("type")][runeData:getProperty("id")]
+
+												if csvData and cfg.condition2 <= csvData.rarity then
+													rcount = rcount + 1
+												end
+											end
+										end
+									end
+									if rcount == 6 then
+										count = count + 1
+									end
+								end
+								calTask[id] = count
+							elseif cfg.type == 20 then	-- 开启x品质时钟箱子
+								if cfg.condition2 <= (param2 or 0) then
+									calTask[id] = (calTask[id] or 0) + param2
+								end
+							elseif cfg.type == 15 then -- 通关关卡
+								if (calTask[id] or 0) == 0 then
+									local hangPass = self:getProperty("hangPass")
+									local diff = math.floor(cfg.condition2 / 10000)
+									if (hangPass[diff] or 0) >= cfg.condition1 then
+										calTask[id] = 1
+									end
+								end
+							end
 						end
 					end
 				end
 			end
 		end
+		self:updateProperty({field = "calTask", value = calTask, notNotify = notNotify})
+		--dump(calTask)
 	end
  
 end
@@ -90,7 +90,7 @@ function Role:updateTimeReset(now, notify)
 	self:setProperties({timeReset = timeReset, ltime = now})
  
 	response.timeReset = timeReset
-	response.ltime = ltime
+	response.ltime = now
  
 	if notify then
 		self:notifyUpdateProperties(response)
@@ -23,11 +23,11 @@ Store.schema = {
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
     battleLR = {"string", ""},		-- 付费赛季卡领取记录
  
-    limitTPack = {"table", {}},      -- 限时礼包 {id=expire_ts}
+    limitTPack = {"table", {}},      -- 限时礼包 {id={expire_ts, trigger_type}}
     privCardEx = {"number", 0},          -- 特权卡过期时间戳
     getMailT1 = {"number",0},       -- 上次发送月卡福利邮件的时间
     getMailT2 = {"number",0},       -- 上次发送超级月卡福利邮件的时间
-    packTrigger = {"table", {}},     -- 礼包触发记录 {关卡难度1={id, 通关关卡数，升级数，爬塔层数}, ...}
+    --packTrigger = {"table", {}},     -- 礼包触发记录 {关卡难度1={id, 通关关卡数，升级数，爬塔层数}, ...}
  
     -- 活动商品购买记录
     actGoodsFlag = {"table", {}},       -- ActGoodsType  1购买，0未购买
@@ -57,7 +57,7 @@ end
 function Store:onCrossDay()
     self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
-    self:checkPaySignReward()
+    --self:checkPaySignReward()
 end
  
 -- 删除过期商品
@@ -65,10 +65,11 @@ function Store:deleteExpireLimitGoods()
     local timeNow = skynet.timex()
     local limitGoodsList = self:getProperty("limitTPack")
     for k, v in pairs(limitGoodsList) do
-        if timeNow > v then
+        if timeNow > v[1] then
             limitGoodsList[k] = nil
         end
     end
+    self:updateProperty({field = "limitTPack", value = limitGoodsList, notNotify = true})
 end
  
 -- 发送月卡邮件
@@ -162,6 +163,26 @@ function Store:getGearExchangeCoef()
     return 1 + coef
 end
  
+-- 奖励关卡 特权卡额外数量
+function Store:getBonusExtraFightCount()
+    if self:isPrivCardExpire() then
+        return 0
+    end
+
+    local cnt = globalCsv.bonus_extra_fight_count or 1
+    return cnt
+end
+
+-- 挂机道具掉落系数 特权卡挂机掉落系数
+function Store:getHangDropCoef()
+    if self:isPrivCardExpire() then
+        return 1, 1
+    end
+
+    return (1 + globalCsv.hang_drop_exp_coef) or 1, (1 + globalCsv.hang_drop_item_coef) or 1
+end
+
+
 -- 购买通行证
 function Store:onBuyCard(type, duration, id)
     local timeNow = skynet.timex()
@@ -203,7 +224,7 @@ end
  
 --检测购买是否超过限制数量
 function Store:checkRechargeRecord(limit, id)
-    local rechargeRecord = self:getProperty("payR")
+    local rechargeRecord = self:getProperty("payR") or {}
     if limit ~= 0 and limit <= (rechargeRecord[id] or 0) then
         skynet.error(string.format("recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
         return false
@@ -292,96 +313,103 @@ end
 --触发限时礼包
 function Store:OnTriggerLimitTimePack(eventType, param)
     local limitPack = self:getProperty("limitTPack")
-    local payRecord = self:getProperty("payR")
+    --local payRecord = self:getProperty("payR")
     local timeNow = skynet.timex()
-    local find = false
+    --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
-    limitPack = {}
-    local hangPass = self.owner:getProperty("hangPass")
-    local triggerRecord = self:getProperty("packTrigger")
-    local result = {}
-    local maxDiff = 0
+    --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 shopGoodsId = 0
-    for diff, cfg in pairs(result) do
-        if diff == maxDiff then
-            local record = triggerRecord[diff] or {}
-            if (record[0] or 0) ~= cfg.id and next(record) then
-                record = {}
-            end
-            record[0] = cfg.id
-            record[eventType] = (record[eventType] or 0) + 1
-            if record[eventType] > 0 and record[eventType] % 10 == 0 then
-                local pool = cfg.packId:toArray(true, "=")
-                local idx = math.random(1, #pool)
-                shopGoodsId = pool[idx]
-            end
-            triggerRecord[diff] = record
+    --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
+            config = cfg
         end
     end
-    if shopGoodsId ~= 0 then
-        local rechargeCfg = csvdb["shop_rechargeCsv"][shopGoodsId]
+    if config ~= nil then
+        local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
         if rechargeCfg then
-            limitPack[rechargeCfg.id] = timeNow + rechargeCfg.time
+            limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
+            self.owner:log("push_gift", {
+                gift_id = rechargeCfg.id, --礼包ID
+                gift_name = rechargeCfg.title,   --礼包名称
+            })
             self:updateProperty({field = "limitTPack", value = limitPack})
         end
     end
-    if next(result) then
-        self:updateProperty({field = "packTrigger", value = triggerRecord})
-    end
+    --if next(result) then
+    --    self:updateProperty({field = "packTrigger", value = triggerRecord})
+    --end
 end
  
 function GetActGoodsIndex(goodsType)
     return ActGoodsType[goodsType] or 0
 end
  
--- 购买付费签到 按开服时间算奖励
-function Store:onBuyPaySignCard(dur)
-    local curTs = skynet.timex()
+function Store:SetActGoodsFlag(goodsType, flag)
     local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
-    local goodsIndex = GetActGoodsIndex("paySignIn")
+    local goodsIndex = GetActGoodsIndex(goodsType)
     if goodsIndex == 0 then
         print("get act goods index fail :paySignIn")
         return
     end
-    actGoodsFlag[goodsIndex] = 1
+    actGoodsFlag[goodsIndex] = flag
     self:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
-    -- 发钱
-    local change
-    local reward, curData = self.owner.activity:getPaySignReward()
-	if next(reward) then
-        self.owner.activity:updateActData("PaySignIn", curData)
-        reward, change = self.owner:award(reward, {log = {desc = "actPaySign"}})
-	end
-
-	self.owner:log("activity", {
-		activity_id = 0, -- 活动ID（或活动指定任务的ID）
-		activity_type = self.owner.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
-		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
-	})
+end
  
-	SendPacket(actionCodes.Activity_actPaySignRewardNtf, MsgPack.pack(self.owner:packReward(reward, change)))
+-- 购买付费签到 按开服时间算奖励
+function Store:onBuyPaySignCard(dur)
+    local curTs = skynet.timex()
+	curTs = getServerOpenTs()
+
+    self:SetActGoodsFlag("paySignIn", curTs)
+
+    --local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
+    --local goodsIndex = GetActGoodsIndex("paySignIn")
+    --if goodsIndex == 0 then
+    --    print("get act goods index fail :paySignIn")
+    --    return
+    --end
+    --actGoodsFlag[goodsIndex] = 1
+    --self:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
+    -- 发钱
+    --local change
+    --local reward, curData = self.owner.activity:getPaySignReward()
+	--if next(reward) then
+    --    self.owner.activity:updateActData("PaySignIn", curData)
+    --    reward, change = self.owner:award(reward, {log = {desc = "actPaySign"}})
+	--end
+
+	--self.owner:log("activity", {
+	--	activity_id = 0, -- 活动ID（或活动指定任务的ID）
+	--	activity_type = self.owner.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
+	--	activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	--})
+
+	--SendPacket(actionCodes.Activity_actPaySignRewardNtf, MsgPack.pack(self.owner:packReward(reward, change)))
 end
  
 function Store:checkPaySignReward()
@@ -392,7 +420,35 @@ function Store:checkPaySignReward()
 	end
 end
  
+-- 临时用 登录触发限时礼包 时间点以后
+function Store:OnTriggerLimitTimePackAfterTs(eventType, param)
+    local limitPack = self:getProperty("limitTPack")
+    local timeNow = skynet.timex()
+    local config = nil
+    for id, cfg in pairs(csvdb["shop_packCsv"]) do
+        local ts = toUnixtime(""..cfg.condition)
+        if cfg.type == eventType and ts < param then
+            config = cfg
+
+            if config ~= nil then
+                local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
+                if rechargeCfg then
+                    if not limitPack[rechargeCfg.id] then
+                        limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
+                        self.owner:log("push_gift", {
+                            gift_id = rechargeCfg.id, --礼包ID
+                            gift_name = rechargeCfg.title,   --礼包名称
+                        })
+                        self:updateProperty({field = "limitTPack", value = limitPack, notNotify = false})
+                    end
+                end
+            end
+        end
+    end
+end
+
 function Store:data()
+    self:OnTriggerLimitTimePackAfterTs(TriggerEventType.AfterTs, skynet.timex())
 	return {
         buyR		= self:getProperty("buyR"),
         payR	= self:getProperty("payR"),
@@ -405,7 +461,7 @@ function Store:data()
         battleLR  = self:getProperty("battleLR"),
         limitTPack = self:getProperty("limitTPack"),
         privCardEx = self:getProperty("privCardEx"),
-        packTrigger = self:getProperty("packTrigger"),
+        --packTrigger = self:getProperty("packTrigger"),
         actGoodsFlag = self:getProperty("actGoodsFlag"),
         bpInfo = self:getProperty("bpInfo"),
 	}
@@ -5,6 +5,7 @@ local netpack = require &quot;skynet.netpack&quot;
 local xxtea = require "xxtea"
 local deque = require "deque"
 local datacenter = require "skynet.datacenter"
+local agent_queued = require "services.agent_queued"
  
 local pcall = pcall
 local string_format = string.format
@@ -58,10 +59,15 @@ function _M:exit_agent(fd)
 	local agent = get_a(pack)
  
 	pcall(skynet.send, agent, "lua", "exit")
-	pcall(skynet.send, poold, "lua", "feed")
  
 	self.f2u[fd] = nil
 	self.u2f[uid] = nil
+	local nuid, nfd = agent_queued.pop()
+	if not nuid then
+		pcall(skynet.send, poold, "lua", "feed")
+	else
+		self:query_agent(nfd, nuid, true)
+	end
 end
  
 -- @desc: 客户端连入
@@ -73,7 +79,11 @@ end
 function _M:socket_close(fd)
 	self.f2i[fd] = nil
 	local uid = self.f2u[fd]
-	if not uid then return end
+	if not uid then 
+		-- 排队中?
+		agent_queued.socket_close(fd)
+		return 
+	end
 	self.f2e[fd] = skynet.timex() + AGENT_EXPIRE_TIME
  
 	if not self.u2f[uid] then
@@ -89,7 +99,11 @@ end
 function _M:socket_error(fd)
 	self.f2i[fd] = nil
 	local uid = self.f2u[fd]
-	if not uid then return end
+	if not uid then 
+		-- 排队中?
+		agent_queued.socket_close(fd)
+		return 
+	end
  
 	if not self.u2f[uid] then
 		self.f2u[fd] = nil
@@ -114,6 +128,7 @@ local next_log_time = 0
 local CHECK_AGENT_STATUS_INTERVAL 	= 100 -- 检查agent状态的定时间隔
 -- @desc: 检查agent状态，若过期，则让agent退出；并定时打日志统计在线人数
 function _M:check_agent_status()
+	agent_queued.handle_timeout()
 	local now = skynet.timex()
 	if now >= next_check_time then
 		next_check_time = now + CHECK_AGENT_STATUS_INTERVAL
@@ -151,7 +166,7 @@ local function query_agent_response(fd, response)
 end
  
 -- @desc: 玩家登陆第一个包，queryLogin，watchdog为客户端分配一个agent，并告诉gate分配成功，之后的消息直接走agent
-function _M:query_agent(fd, uid)
+function _M:query_agent(fd, uid, isQueue)
 	local pack = self.u2f[uid]
 	if pack then
 		local f = get_f(pack)
@@ -159,7 +174,6 @@ function _M:query_agent(fd, uid)
 			skynet.error(string.format("%s same fd %d", uid, fd))
 			return 
 		end
-
 		-- self.f2u[f] 肯定存在；self.f2e[f]不存在，则说明在线，则需要踢下线
 		if not self.f2e[f] then
 			local head = string.pack("H", actionCodes.Sys_maintainNotice)
@@ -182,12 +196,29 @@ function _M:query_agent(fd, uid)
 		self.f2u[f] = nil
 		self.u2f[uid] = set_pack(fd, agent)
 	else
-		-- 该uid未存储，则说明至少超过10分钟未登陆，由agent池服务pop出一个agent
-		local agent = self.factory:pop()
-		if not agent then
-			-- 服务器满
-			query_agent_response(fd, {ret = "RET_SERVER_FULL"})
-			return 
+		local agent
+		if isQueue then
+			agent = self.factory:pop()
+			if agent then
+				pcall(skynet.send, poold, "lua", "feed")
+			else
+				agent = skynet.newservice("agent")
+			end
+		else
+			-- 该uid未存储，则说明至少超过10分钟未登陆，由agent池服务pop出一个agent  
+			if agent_queued.count() > 0 then
+				-- 服务器满 开始排队
+				local rank = agent_queued.push(uid, fd)
+				query_agent_response(fd, {ret = "RET_SERVER_FULL", rank = rank})
+				return 
+			end
+
+			agent = self.factory:pop()
+			if not agent then
+				local rank = agent_queued.push(uid, fd)
+				query_agent_response(fd, {ret = "RET_SERVER_FULL", rank = rank})
+				return 
+			end
 		end
  
 		local ok = pcall(skynet.call, agent, "lua", "start", gate_serv, fd, self.f2i[fd], hotfixList)
@@ -0,0 +1,154 @@
+-- 排队系统
+
+require "ProtocolCode"
+require "shared.init"
+require "utils.init"
+require "GlobalVar"
+require "RedisKeys"
+require "skynet.manager"
+
+local queue = require "skynet.queue"
+local netpack = require "skynet.netpack"
+local socket = require "skynet.socket"
+local xxtea = require "xxtea"
+
+skynet = require "skynet"
+
+local MAX_COUNT = tonumber(skynet.getenv("max_queue"))
+-- 心跳定时间隔
+local HEART_TIMER_INTERVAL 		= 30
+local HEART_TIMEOUT_COUNT_MAX 	= 3
+
+local CMD = {}
+local f2u = {}
+local u2i = {}	-- {idx, fd, {lastHeart, timeOutCount, nextCheck}}
+local idx2u = {}
+local curIdx = 0  -- 下一个即将进入游戏的玩家索引
+local nextIdx = 0  -- 新加的位置
+
+
+local function getRank(uid)
+	local info = u2i[uid]
+	if not info then return -1 end
+	return (info[1] + MAX_COUNT - curIdx) % MAX_COUNT + 1
+end
+
+
+function SendPacket(actionCode, bin, client_fd)
+	if #bin > 0 then bin = xxtea.encrypt(bin, XXTEA_KEY) end
+	local head = string.pack("H", actionCode)
+	return socket.write(client_fd, netpack.pack(head .. bin))
+end
+
+local function checkQueue(fd)
+	if not f2u[fd] then return end
+	local info = u2i[f2u[fd]]
+	if info then
+		info[3][1] = skynet.timex()
+	end
+	local rank = getRank(f2u[fd])
+	SendPacket(actionCodes.Sys_checkQueue, MsgPack.pack({rank = rank}), fd)
+end
+
+
+skynet.register_protocol {
+	name = "client",
+	id = skynet.PTYPE_CLIENT,
+	unpack = function (msg, sz)
+		local data = skynet.tostring(msg, sz)
+		local cmd = string.unpack("H", string.sub(data, 1, 2))
+		return cmd, string.sub(data, 3)
+	end,
+	dispatch = function(session, address, cmd, data)
+		skynet.ignoreret()
+		if cmd == actionCodes.Sys_checkQueue then
+			checkQueue(session)
+		end
+	end
+}
+
+function CMD.push(uid, fd)
+	uid = tostring(uid)
+	if u2i[uid] then -- 存在]
+		local oldfd = u2i[uid][2]
+		if  oldfd and oldfd ~= fd then 
+			-- 踢掉老的
+			SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({body = "server_accountOccupied", iskey = true}), oldfd)
+			skynet.timeout(10, function ()
+				skynet.call(gate_serv, "lua", "kick", oldfd)
+			end)
+			f2u[oldfd] = nil
+		end
+		u2i[uid][2] = fd
+		f2u[fd] = uid
+		u2i[uid][3] = {skynet.timex(), 0, skynet.timex() + HEART_TIMER_INTERVAL}
+	else -- 新排队的用户
+		if nextIdx == curIdx and next(idx2u) then -- 满了
+			return 
+		end
+		u2i[uid] = {nextIdx, fd, {skynet.timex(), 0, skynet.timex() + HEART_TIMER_INTERVAL}}
+		f2u[fd] = uid
+		idx2u[nextIdx] = uid
+		nextIdx = (nextIdx + 1) % MAX_COUNT
+	end
+	skynet.call(gate_serv, "lua", "forward", fd, 0, skynet.self())
+
+	return getRank(uid)
+end
+
+function CMD.pop()
+	while true do
+		local uid = idx2u[curIdx]
+		if not uid then return end  -- 空的
+		local info = u2i[uid]
+		if not info then
+			idx2u[curIdx] = nil
+		else
+			if info[2] then
+				-- 找到合适的了
+				u2i[uid] = nil
+				idx2u[curIdx] = nil
+				f2u[info[2]] = nil
+
+				curIdx = (curIdx + 1) % MAX_COUNT
+				return uid, info[2]
+			else
+				idx2u[curIdx] = nil
+				u2i[uid] = nil
+			end
+		end
+		curIdx = (curIdx + 1) % MAX_COUNT
+	end
+end
+
+
+-- 下线了
+function CMD.socket_close(fd)
+	local uid = f2u[fd]
+	if not uid then return end
+	f2u[fd] = nil
+	local info = u2i[uid]
+	info[2] = nil
+end
+
+function CMD.handle_timeout()
+	local now = skynet.timex()
+	for uid, info in pairs(u2i) do
+		if info[2] and info[3] and now >= info[3][3] then --存在fd 检查心跳
+			if info[3][1] -  now > HEART_TIMER_INTERVAL or now - info[3][1] > HEART_TIMER_INTERVAL then
+				info[3][2] = info[3][2] + 1
+				info[3][3] = now + HEART_TIMER_INTERVAL
+				if info[3][2] >= HEART_TIMEOUT_COUNT_MAX then
+					skynet.error("timeout! then queued will closed", info[2], uid)
+					skynet.call(gate_serv, "lua", "kick", info[2])
+				end
+			end
+		end
+	end
+end
+
+function CMD.count()
+	return (nextIdx + MAX_COUNT - curIdx) % MAX_COUNT
+end
+
+return CMD
@@ -17,15 +17,32 @@ local HEART_TIMEOUT_COUNT_MAX 	= 20
 local HEART_QUICK_COUNT_MAX 	= 5
 -- 心跳定时间隔
 local HEART_TIMER_INTERVAL 		= 5
+-- 忽略心跳的等待时间
+local WAIT_IGNORE_HEART			= 300
+
+--开始忽略心跳的时间
+local ignoreHeartTime = nil
  
 local function check_heart_beat(agent, now)
 	-- 充值等操作不检查心跳
 	local role = agent.role
-	if role.ignoreHeartbeat then
+	if not role or role.ignoreHeartbeat then
 		lastHeartCheckTime = now - HEART_TIMER_INTERVAL
 		heartTimeoutCount = 0
+
+		if not ignoreHeartTime then
+			ignoreHeartTime = now
+		end
+
+		if now - ignoreHeartTime >= WAIT_IGNORE_HEART then -- 等待太久了 踢掉
+			skynet.error("timeout! then agent will shut down by self with ignoreHeartbeat or no login", agent.client_fd)
+			skynet.call(agent.gate_serv, "lua", "kick", agent.client_fd)
+			ignoreHeartTime = nil
+		end
 		return
 	end
+	ignoreHeartTime = nil
+
 	if lastHeartCheckTime - now > HEART_TIMER_INTERVAL or
 		now - lastHeartCheckTime > HEART_TIMER_INTERVAL then
 		heartTimeoutCount = heartTimeoutCount + 1
@@ -46,6 +63,7 @@ function _M:update(agent)
 		pcall(check_heart_beat, agent, now)
 		nextCheckTime = now + HEART_TIMER_INTERVAL
 	end
+	if not role then return end
 	pcall(role.onRecoverTimer, role, now)
 end
  
@@ -73,6 +91,7 @@ end
 function _M:reset()
 	heartTimeoutCount = 0
 	heartQuickCount = 0
+	ignoreHeartTime = nil
 	lastHeartCheckTime = skynet.timex()
 end
  
@@ -7,14 +7,15 @@ local deque = require &quot;deque&quot;
 local CMD = {}
 local factory
  
+local PRE_FEED_COUNT = 5
 local dead = 0
 -- agent死亡，通知poold补充，当累计到5个agent时，马上生成5个agent放入poold中
 -- 当然这里也可以写得更复杂，参考redis落地规则
 function CMD.feed()
 	dead = dead + 1
-	if dead == 5 then
+	if dead == PRE_FEED_COUNT then
 		dead = 0
-		for i=1, 5 do
+		for i=1, PRE_FEED_COUNT do
 			factory:push(skynet.newservice("agent"))
 		end
 	end
@@ -161,6 +161,18 @@ function diffFromOpen()
 	return math.floor((now - openTime) / DAY_SEC)
 end
  
+function diffFromTs(ts)
+	local now = skynet.timex()
+	local tm = os.date("*t", ts)
+
+	local time = os.time({year = tm.year, month = tm.month, day = tm.day, hour = RESET_TIME})
+	if now < time then
+		return 0
+	end
+
+	return math.floor((now - time) / DAY_SEC)
+end
+
 function getServerOpenTs()
 	local openTime = os.time{
 		year = tonum(SERV_OPEN:sub(1,4)),
@@ -298,7 +310,7 @@ function notifyClient(params)
 	params.key = "zhaolugame20170831"
  
 	local status, body = httpc.get(skynet.getenv("codeurl"), 
-		"/mipush/notify_user?" .. httpGetFormatData(params), {}, {})
+		"/push/notify_user?" .. httpGetFormatData(params), {}, {})
 	if tonumber(status) ~= 200 then
 		skynet.error(status, body)
 		return
@@ -313,7 +325,7 @@ function deleteNotify(params)
 	params.key = "zhaolugame20170831"
  
 	local status, body = httpc.get(skynet.getenv("codeurl"), 
-		"/mipush/delete_notify?" .. httpGetFormatData(params), {}, {})
+		"/push/delete_notify?" .. httpGetFormatData(params), {}, {})
 	if tonumber(status) ~= 200 then
 		skynet.error(status, body)
 		return
@@ -347,4 +347,20 @@ function string.toMap(str, tonum, sep)
 		end
 	end
 	return tab
+end
+
+--[[
+from: 1=2=3=4
+to: {1,2,3,4}
+]]
+function string.toMap(str, tonum, sep)
+	local str_vec = string.split(str, " ")
+	local tab = {}
+	for _, v in pairs(str_vec) do
+		local vec = string.split(v, sep)
+		if #vec == 2 then
+			tab[vec[1]] = tonum and tonumber(vec[2]) or vec[2]
+		end
+	end
+	return tab
 end
 \ No newline at end of file