Merge branch 'develop' into tr/qa

熊润斐
2 parents feb7d322 04b84e1e
Showing 21 changed files with 270 additions and 69 deletions Show diff stats
config/develop.lua
src/GlobalVar.lua
src/actions/AdvAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvBuff.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/csvdata
src/models/Activity.lua
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/Store.lua
src/services/agent_ctrl.lua
src/services/queued.lua -> src/services/agent_queued.lua
src/services/poold.lua
@@ -2,7 +2,7 @@ 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
@@ -212,6 +212,7 @@ AdvBackEventType = {
 	Artifact = 24, --获得神器
 	Level = 25, -- 升级
 	LinkChooseOver = 26, -- 连锁事件结束
+	BuffEffect = 27, -- buff 效果
 }
 AdvScoreType = {
@@ -439,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
@@ -501,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
@@ -587,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)
@@ -612,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 -- 现在穿着呢。更新下
@@ -774,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})
@@ -793,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
@@ -268,12 +268,12 @@ function _M.endBattleRpc(agent, data)
 	end
 	local nextCarbonId = role:getNextCarbonId(carbonId)
 	-- 设置挂机关卡
-	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
-		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})
@@ -738,7 +738,7 @@ function _M.drawHeroRpc(agent, data)
 	if btype == 1 then
 		-- 判断定向卡池活动开启
-		if not role.activity:isOpen("RaceDraw") then
+		if not role.activity:isOpen("SsrUpPoolChange") then
 			return
 		end
 	end
@@ -946,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]
@@ -681,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
 	-- 获取奖励
@@ -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
@@ -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
-Subproject commit d2c3deaddd4952cd4b05306144cbcdfa09734cd3
+Subproject commit fa67cf8b44c11ad75a4d67525fc906d91e17655b
@@ -18,7 +18,7 @@ Activity.ActivityType = {
 	DrawHero = 12,	--抽卡周 招募
 	AdvDraw = 13,	--拾荒抽周 资助
 	OpenBox = 14,	--拆解周 时钟箱
-	RaceDraw = 15,  -- 定向招募活动
+	--RaceDraw = 15,  -- 定向招募活动
 }
@@ -162,6 +162,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
@@ -422,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)
@@ -1189,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
@@ -1211,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)
@@ -353,6 +353,10 @@ function Store:OnTriggerLimitTimePack(eventType, param)
         local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
         if rechargeCfg then
             limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
+            self.owner:log("push_gift", {
+                gift_id = rechargeCfg.id, --礼包ID
+                gift_name = rechargeCfg.title,   --礼包名称
+            })
             self:updateProperty({field = "limitTPack", value = limitPack})
         end
     end
@@ -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
@@ -59,16 +60,14 @@ function _M:exit_agent(fd)
 	pcall(skynet.send, agent, "lua", "exit")
-	-- 这里检查是否有排队用户
-	local nuid, nfd = skynet.call(queued_serv, "lua", "pop")
+	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
-
-	self.f2u[fd] = nil
-	self.u2f[uid] = nil
 end
 -- @desc: 客户端连入
@@ -82,7 +81,7 @@ function _M:socket_close(fd)
 	local uid = self.f2u[fd]
 	if not uid then 
 		-- 排队中?
-		pcall(skynet.call, queued_serv, "lua", "socket_close", fd)
+		agent_queued.socket_close(fd)
 		return 
 	end
 	self.f2e[fd] = skynet.timex() + AGENT_EXPIRE_TIME
@@ -102,7 +101,7 @@ function _M:socket_error(fd)
 	local uid = self.f2u[fd]
 	if not uid then 
 		-- 排队中?
-		pcall(skynet.call, queued_serv, "lua", "socket_close", fd)
+		agent_queued.socket_close(fd)
 		return 
 	end
@@ -129,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
@@ -196,16 +196,26 @@ function _M:query_agent(fd, uid, isQueue)
 		self.f2u[f] = nil
 		self.u2f[uid] = set_pack(fd, agent)
 	else
-		-- 该uid未存储，则说明至少超过10分钟未登陆，由agent池服务pop出一个agent
-		local agent 
+		local agent
 		if isQueue then
-			agent = skynet.newservice("agent")
+			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 ok, rank = pcall(skynet.call, queued_serv, "lua", "push", uid, fd)
+				local rank = agent_queued.push(uid, fd)
 				query_agent_response(fd, {ret = "RET_SERVER_FULL", rank = rank})
 				return 
 			end
@@ -18,7 +18,6 @@ local MAX_COUNT = tonumber(skynet.getenv(&quot;max_queue&quot;))
 -- 心跳定时间隔
 local HEART_TIMER_INTERVAL 		= 30
 local HEART_TIMEOUT_COUNT_MAX 	= 3
-local gate_serv
 local CMD = {}
 local f2u = {}
@@ -28,7 +27,6 @@ local curIdx = 0  -- 下一个即将进入游戏的玩家索引
 local nextIdx = 0  -- 新加的位置
-
 local function getRank(uid)
 	local info = u2i[uid]
 	if not info then return -1 end
@@ -63,18 +61,12 @@ skynet.register_protocol {
 	end,
 	dispatch = function(session, address, cmd, data)
 		skynet.ignoreret()
-		cs(function()
-			if cmd == actionCodes.Sys_checkQueue then
-				checkQueue(session)
-			end
-		end)
+		if cmd == actionCodes.Sys_checkQueue then
+			checkQueue(session)
+		end
 	end
 }
-function CMD.open(serv)
-	gate_serv = serv
-end
-
 function CMD.push(uid, fd)
 	uid = tostring(uid)
 	if u2i[uid] then -- 存在]
@@ -129,6 +121,7 @@ function CMD.pop()
 	end
 end
+
 -- 下线了
 function CMD.socket_close(fd)
 	local uid = f2u[fd]
@@ -138,8 +131,7 @@ function CMD.socket_close(fd)
 	info[2] = nil
 end
-
-local function handle_timeout()
+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 检查心跳
@@ -153,26 +145,10 @@ local function handle_timeout()
 			end
 		end
 	end
-	skynet.timeout(100, handle_timeout)
 end
+function CMD.count()
+	return (nextIdx + MAX_COUNT - curIdx) % MAX_COUNT
+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
+return CMD
@@ -7,7 +7,7 @@ local deque = require &quot;deque&quot;
 local CMD = {}
 local factory
-local PRE_FEED_COUNT = 1
+local PRE_FEED_COUNT = 5
 local dead = 0
 -- agent死亡，通知poold补充，当累计到5个agent时，马上生成5个agent放入poold中
 -- 当然这里也可以写得更复杂，参考redis落地规则
@@ -66,7 +66,6 @@ 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")
@@ -138,5 +137,4 @@ skynet.start(function()
 	skynet.newservice("services/chated")
 	-- 网关服务
 	gate_serv = skynet.newservice("gate")
-	queued_serv = skynet.newservice("services/queued")
 end)