Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

测试
2 parents 87c65a8d e24d1abd
Showing 9 changed files with 43 additions and 50 deletions Show diff stats
config/develop.lua
src/GlobalVar.lua
src/adv/AdvBattle.lua
src/adv/AdvBuff.lua
src/adv/AdvPlayer.lua
src/services/agent_ctrl.lua
src/services/queued.lua -> src/services/agent_queued.lua
src/services/poold.lua
src/services/watchdog.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 = {
@@ -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
@@ -699,6 +699,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
@@ -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)