fix confict

liuzujun · xiongrenfei
2 parents 00bf6029 a5b98c30
Showing 11 changed files with 250 additions and 44 deletions Show diff stats
config/develop.lua
src/ProtocolCode.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/agent.lua
src/main.lua
src/services/agent_ctrl.lua
src/services/agent_util.lua
src/services/poold.lua
src/services/queued.lua
src/services/watchdog.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
@@ -7,6 +7,7 @@ actionCodes = {
 	Sys_commonNotice = 5,
 	Sys_maintainNotice = 6,
 	Sys_customNotice = 7,
+	Sys_checkQueue = 8,
 	Gm_clientRequest = 20,
 	Gm_receiveResponse = 21,
@@ -165,16 +165,6 @@ function _M.startRpc( agent, data )
 	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
@@ -265,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
@@ -344,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
@@ -54,9 +54,6 @@ 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")})
@@ -129,6 +126,10 @@ 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", {})
@@ -847,8 +848,8 @@ function _M.drawHeroRpc(agent, data)
 	role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
 	local guideHero = nil
-	if role:getProperty("newerGuide") == "11=1" then
-		guideHero = globalCsv.newdraw_hero_item_id or 613
+	if role:getProperty("newerGuide") == "8=1" then
+		guideHero = globalCsv.newdraw_hero_item_id or 503
 	end
 	local ssrCount = 0
@@ -907,7 +908,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
@@ -1027,4 +1028,4 @@ function _M.changeCrown(agent, data)
 	return true
 end
-return _M
 \ No newline at end of file
+return _M
@@ -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
 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"),
@@ -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)
@@ -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 = 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)