Merge branch 'develop' into tr/ob

* develop: 队列长度物品 robot redis 信息

Merge branch 'develop' into tr/ob
* develop: 队列长度物品 robot redis 信息
zhouhaihai
2 parents 68ce7a2d 3b903aa0
Showing 9 changed files with 34 additions and 29 deletions Show diff stats
robot/robot.lua
robot/robot_config.lua
robot/start.lua
robot/unitTest/adv.lua
robot/unitTest/hero.lua
robot/unitTest/item.lua
src/actions/HttpAction.lua
src/services/httpweb.lua
src/services/redisd.lua
@@ -120,7 +120,7 @@ local function startUnit(unit)
 	local ok, unitTest = pcall(require, "unitTest." .. unit)
 	if not ok then
-		print("unitTest load error : " .. unitTest)
+		log("unitTest load error : " .. unitTest)
 	end
 	unitTest.new(client):startTest()
@@ -142,7 +142,7 @@ function CMD.start(fd, id)
 	client.uname = uname
 	local status, body = httpc.get(config.http, "/login?" .. httpGetFormatData({token = uname, device = "test", channel = "develop"}))
 	if tonumber(status) ~= 200 then
-		print("http get error", uname, body)
+		log("http get error", uname, body)
 		return
 	end
 	local servInfo = json.decode(body)
@@ -170,7 +170,7 @@ skynet.register_protocol {
 	dispatch = function(session, address, cmd, data)
 		local actionName = actionHandlers[cmd]
 		if not actionName then
-			print("actionName not exist", actionName)
+			log("actionName not exist", actionName)
 			return
 		end
@@ -10,7 +10,7 @@ end
 return {
-	http = "http://106.13.60.20:9090", -- 登录服
+	http = "http://192.168.0.199:9090", -- 登录服
 	host = "127.0.0.1", --服务器地址
 	port = 12001,  	-- 服务器端口
@@ -18,21 +18,21 @@ return {
 	online = 100,	-- 稳定状态在线人数
 	inpre = 10,		-- 稳定前每秒进入人数  -- 必须小于online数
 	max = 200, 	-- 最大玩家数 必须大于 online 数
-	online_time = {10 * 60, 20 * 60}, -- 在线时间控制 秒
+	online_time = {10, 60}, -- 在线时间控制 秒
-	uname_prefix = "robot", --机器名称前缀
+	uname_prefix = "robothehe", --机器名称前缀
 	-- 机器上线后的行为
 	units = {
-		chat = {weight = 100}, -- 聊天
-		item = {weight = 100}, -- 物品操作
-		hero = {weight = 500}, -- 英雄 
-		hang = {weight = 1000}, -- 挂机战斗 
-		tower = {weight = 500}, -- 爬塔
-		car = {weight = 100}, -- 爬塔
-		pvp = {weight = 500}, -- pvp
-		email = {weight = 100}, -- 邮件
-		adv = {weight = 200}, -- 冒险
+		chat = {weight = 1}, -- 聊天
+		item = {weight = 1}, -- 物品操作
+		hero = {weight = 1}, -- 英雄 
+		hang = {weight = 1}, -- 挂机战斗 
+		tower = {weight = 1}, -- 爬塔
+		car = {weight = 1}, -- 爬塔
+		pvp = {weight = 1}, -- pvp
+		email = {weight = 1}, -- 邮件
+		adv = {weight = 1}, -- 冒险
 	}
 }
@@ -15,7 +15,7 @@ local id_max = 0 -- robot id
 function MSG.open( ... )
-	print("open", ...)
+	log("open", ...)
 end
 function MSG.close(fd)
@@ -30,7 +30,7 @@ function MSG.close(fd)
 end
 function MSG.error(fd, msg)
-	print("MSG.error", fd, msg)
+	log("MSG.error", fd, msg)
 	MSG.close(fd)
 end
@@ -8,6 +8,8 @@ local _M = class(&quot;hang&quot;, require(&quot;unitTest.unitTest&quot;))
 function _M:start()
 	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "fb", pm1 = 10606}))
+	requestServer(actionCodes.Adv_roleFormatRpc,  MsgPack.pack({index = 1, title = "hehe", leader = 1, leader2 = 2, heros = {[1] = 1, [2] = 2}}))
+	requestServer(actionCodes.Adv_selectTeamRpc,  MsgPack.pack({index = 1}))
 	self:task()
 end
@@ -24,8 +26,8 @@ function _M:task()
 end
 function _M:startAdv()
-	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "advf", pm1 = 10606}))
-	requestServer(actionCodes.Adv_startAdvRpc,  MsgPack.pack({chapterId = 101, format = {leader = 1, leader2 = 2, heros = {[1] = 1, [2] = 2}}}))
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "advf"}))
+	requestServer(actionCodes.Adv_startAdvRpc,  MsgPack.pack({chapterId = 101}))
 	requestServer(actionCodes.Adv_exitAdvRpc, '')
 end
@@ -35,8 +35,8 @@ function _M:drawHero10()
 end
 function _M:createHeroRandom()
-	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 703, pm2 = 20}))
-	requestServer(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack({itemId = 703}))
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 722, pm2 = 40}))
+	requestServer(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack({itemId = 722}))
 end
@@ -31,8 +31,8 @@ end
 function _M:openItem()
-	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 701, pm2 = 20}))
-	requestServer(actionCodes.Role_openItemRpc, MsgPack.pack({itemId = 701, count = 1}))
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 831, pm2 = 1}))
+	requestServer(actionCodes.Role_openItemRpc, MsgPack.pack({itemId = 831, count = 1}))
 end
 function _M:openTimeBox()
@@ -187,6 +187,9 @@ function _M.online(query)
 	return count
 end
+function _M.dbqlen(query)
+	return skynet.call(redisd, "debug", "INFO")
+end
 function _M.account_init(query, body)
 	if not query.id  or not body or body == "" then return "指令不存在" end
@@ -77,11 +77,11 @@ local function start()
 					return 
 				end
 				local query = urllib.parse_query(query)
-				if query.key ~= key then
-					response(id, 404)
-					socket.close(id) 
-					return 
-				end
+				-- if query.key ~= key then
+				-- 	response(id, 404)
+				-- 	socket.close(id) 
+				-- 	return 
+				-- end
 				local content = CMD[cmd](query, body)
 				if not content then
 					code = 404
@@ -25,7 +25,7 @@ skynet.start(function()
 		end
 	end)
 	skynet.info_func(function()
-		skynet.ret(skynet.pack(skynet.call(skynet.self(), "debug", "STAT")))
+		return skynet.stat("mqlen")
 	end)
 	skynet.register ".redis"
 end)
 \ No newline at end of file