Merge branch 'develop' into tr/cb

* develop: 排队功能付费签到改为主动领取，战斗关卡不一定是当前挂机关卡推送挂机关卡可以选择，经验金币根据最高关卡计算 bug 挂机排除噩梦难度英雄帖任务bug 被动技新英雄帖活动初始化日历活动穿戴x个y品质铭文英雄令英雄收集相关任务英雄帖任务简单类型测试

Merge branch 'develop' into tr/cb
* develop: 排队功能付费签到改为主动领取，战斗关卡不一定是当前挂机关卡推送挂机关卡可以选择，经验金币根据最高关卡计算 bug 挂机排除噩梦难度英雄帖任务bug 被动技新英雄帖活动初始化日历活动穿戴x个y品质铭文英雄令英雄收集相关任务英雄帖任务简单类型测试
zhouhaihai
2 parents ca60c395 5e6af9d6
Showing 23 changed files with 577 additions and 115 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/csvdata
src/main.lua
src/models/Activity.lua
src/models/Diner.lua
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
src/services/agent_ctrl.lua
src/services/poold.lua
@@ -6,6 +6,7 @@ codeurl = &quot;192.168.8.223:9090&quot;
 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)  -- 本地时区
@@ -256,7 +256,7 @@ SettingStatus = {
 	},
 }
-EMAIL_LIMIT = 20  --邮件最大数量
+EMAIL_LIMIT = 50  --邮件最大数量
 RedPointTags = {
 	PvpCR = 1,
@@ -7,6 +7,7 @@ actionCodes = {
 	Sys_commonNotice = 5,
 	Sys_maintainNotice = 6,
 	Sys_customNotice = 7,
+	Sys_checkQueue = 8,
 	Gm_clientRequest = 20,
 	Gm_receiveResponse = 21,
@@ -208,6 +209,8 @@ actionCodes = {
 	Activity_sudokuRewardRpc = 652,
 	Activity_actSignRpc = 653,
 	Activity_actPaySignRewardNtf = 654,
+	Activity_actCalendaTaskRpc = 655,
+	Activity_actPaySignRpc = 656,
 }
 rpcResponseBegin = 10000
@@ -183,19 +183,21 @@ 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")
 	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 +205,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 +215,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 +224,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
@@ -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,6 +22,7 @@ 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)
@@ -39,9 +40,9 @@ local function checkReward(role)
 	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)
+	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 +59,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()
@@ -139,6 +141,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,11 +152,14 @@ 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})
 	-- 指定当前引导的步骤
@@ -193,12 +199,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 +220,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 +231,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
@@ -273,8 +280,8 @@ function _M.endBattleRpc(agent, data)
 	end
 	local nextCarbonId = role:getNextCarbonId(carbonId)
 	-- 设置挂机关卡
-	if isWin and hangInfo.carbonId < nextCarbonId then
-		hangInfo.carbonId = nextCarbonId
+	if isWin and (hangInfo.carbonId or 0) < nextCarbonId then
+		hangInfo.expCarbonId = nextCarbonId
 		local cfg = csvdb["idle_battleCsv"][nextCarbonId]
 		if cfg then
 			hangInfo.bossTime = skynet.timex() + cfg.idle_time
@@ -354,7 +361,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 +391,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 +408,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
@@ -60,6 +60,8 @@ function _M.levelUpRpc( agent, data )
 	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
@@ -128,6 +130,8 @@ function _M.wakeRpc(agent, data)
 	})
 	SendPacket(actionCodes.Hero_wakeRpc, '')
+
+	role:checkTaskEnter("HeroStarCollect", {})
 	return true
 end
@@ -595,6 +599,8 @@ function _M.referRunesRpc(agent, data)
 			})
 		end
 	end
+
+	role:checkTaskEnter("RuneQualityCollect", {})
 	SendPacket(actionCodes.Hero_referRunesRpc, "")
 	return true
@@ -728,6 +734,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
@@ -835,7 +848,7 @@ function _M.drawHeroRpc(agent, data)
 	local guideHero
 	if role:getProperty("newerGuide") == "11=1" then
-		guideHero = 613
+		guideHero = globalCsv.newdraw_hero_item_id or 613
 	end
 	local ssrCount = 0
@@ -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")
@@ -550,7 +553,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 +564,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 +619,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
-Subproject commit 9bb26cfdb11f81dbfe6abbc468b44ca9f814deb2
+Subproject commit 29d26c6e3083676ddaa828f8d0b22cd1d0ee48cf
 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 = 15,  -- 定向招募活动
 }
@@ -344,8 +345,9 @@ 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)
+	end,
 }
 -- 充值反馈
@@ -367,6 +369,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,
@@ -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
@@ -174,6 +175,8 @@ Role.schema = {
 	downCvR				= {"number", 0}, -- 下载cv扩展包奖励 
 	feedback			= {"table", {}}, -- 反馈相关信息  {flag = false, count = 0} 	flag是否评论过，count 提示次数
+
+	calTask				= {"table", {}}, -- 英雄令活动 日历任务活动
 }
@@ -395,6 +398,7 @@ function Role:data()
 		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
 		feedback = self:getProperty("feedback"),
 		ctime = self:getProperty("ctime"),
+		calTask = self:getProperty("calTask"),
 	}
 end
@@ -81,6 +81,7 @@ local ItemReason = {
 	birth = 1006, -- 出生奖励
 	actSign = 1007, -- 活动签到
 	actPaySign = 1008, -- 活动付费签到
+	calendaTask = 1009,	-- 英雄帖
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -453,6 +453,7 @@ function RolePlugin.bind(Role)
 		newHero:saveBattleValue()
 		self.heros[heroId] = newHero
 		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job}, params.notNotify)
+		self:checkTaskEnter("HeroQualityCollect", {})
 		if not params.notNotify then
 			local heroResponse = {}
 			table.insert(heroResponse, newHero:data())
@@ -1742,7 +1743,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
@@ -255,11 +255,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 +272,7 @@ local TaskListeners = {
 	SudokuListener,
 	ActivityListener,
 	StoreListener,
+	CalendaTaskListener,
 }
 local RoleTask = {}
@@ -587,6 +588,8 @@ function RoleTask.bind(Role)
 	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 +609,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] < 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] < 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
@@ -57,7 +57,7 @@ end
 function Store:onCrossDay()
     self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
-    self:checkPaySignReward()
+    --self:checkPaySignReward()
 end
 -- 删除过期商品
@@ -356,32 +356,46 @@ 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
+end
+
+-- 购买付费签到 按开服时间算奖励
+function Store:onBuyPaySignCard(dur)
+    local curTs = skynet.timex()
-	self.owner:log("activity", {
-		activity_id = 0, -- 活动ID（或活动指定任务的ID）
-		activity_type = self.owner.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
-		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
-	})
+    self:SetActGoodsFlag("paySignIn", curTs)
-	SendPacket(actionCodes.Activity_actPaySignRewardNtf, MsgPack.pack(self.owner:packReward(reward, change)))
+    --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()
@@ -58,7 +58,14 @@ function _M:exit_agent(fd)
 	local agent = get_a(pack)
 	pcall(skynet.send, agent, "lua", "exit")
-	pcall(skynet.send, poold, "lua", "feed")
+
+	-- 这里检查是否有排队用户
+	local nuid, nfd = skynet.call(queued_serv, "lua", "pop")
+	if not nuid then
+		pcall(skynet.send, poold, "lua", "feed")
+	else
+		self:query_agent(nfd, nuid, true)
+	end
 	self.f2u[fd] = nil
 	self.u2f[uid] = nil
@@ -73,7 +80,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 
+		-- 排队中?
+		pcall(skynet.call, queued_serv, "lua", "socket_close", fd)
+		return 
+	end
 	self.f2e[fd] = skynet.timex() + AGENT_EXPIRE_TIME
 	if not self.u2f[uid] then
@@ -89,7 +100,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 
+		-- 排队中?
+		pcall(skynet.call, queued_serv, "lua", "socket_close", fd)
+		return 
+	end
 	if not self.u2f[uid] then
 		self.f2u[fd] = nil
@@ -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)
@@ -183,11 +197,18 @@ function _M:query_agent(fd, uid)
 		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 = skynet.newservice("agent")
+		else
+			agent = self.factory:pop()
+			if not agent then
+				-- 服务器满
+				-- 开始排队
+				local ok, rank = pcall(skynet.call, queued_serv, "lua", "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)
@@ -7,14 +7,15 @@ local deque = require &quot;deque&quot;
 local CMD = {}
 local factory
+local PRE_FEED_COUNT = 1
 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
@@ -0,0 +1,178 @@
+-- 排队系统
+
+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 gate_serv
+
+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()
+		cs(function()
+			if cmd == actionCodes.Sys_checkQueue then
+				checkQueue(session)
+			end
+		end)
+	end
+}
+
+function CMD.open(serv)
+	gate_serv = serv
+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
+
+
+local function 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
+	skynet.timeout(100, handle_timeout)
+end
+
+
+skynet.start(function()
+	skynet.dispatch("lua", function(session, source, command, ...)
+		-- skynet.trace() --执行序的跟踪统计
+		local f = CMD[command]
+		if f then
+			skynet.ret(skynet.pack(f(...)))
+		end
+	end)
+
+	skynet.info_func(function()
+		local info = {}
+		info.count = (nextIdx + MAX_COUNT - curIdx) % MAX_COUNT
+		return info
+	end)
+
+	cs = queue()
+
+	skynet.timeout(100, handle_timeout)
+end)
 \ No newline at end of file
@@ -66,6 +66,7 @@ end
 function CMD.start(conf)
 	skynet.call(gate_serv, "lua", "open" , conf)
 	skynet.call(redisd, "lua", "open", conf)
+	skynet.call(queued_serv, "lua", "open", gate_serv)
 	if use_logd == 1 then
 		skynet.call(logd, "lua", "open")
@@ -137,4 +138,5 @@ skynet.start(function()
 	skynet.newservice("services/chated")
 	-- 网关服务
 	gate_serv = skynet.newservice("gate")
+	queued_serv = skynet.newservice("services/queued")
 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 -1
+	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