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

liuzujun
2 parents a48ab367 f11742e4
Showing 1 changed file with 8 additions and 5 deletions Show diff stats
src/actions/RoleAction.lua
@@ -83,9 +83,6 @@ function _M.loginRpc( agent, data )
 		end
 	end
-	-- 设备记录
-	redisproxy:sadd(string_format("device:%d", roleId), msg.device)
-
 	local now = skynet.timex()
 	local role = agent.role
 	-- 2
@@ -338,8 +335,14 @@ function _M.loginRpc( agent, data )
 	local hangPass = role:getProperty("hangPass")
 	role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
-	if msg.newdevice then
-		role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+
+	-- 是否是新设备
+	local deviced = cluster.query("center", "deviced")
+	if deviced then
+		local status, back = pcall(cluster.call, "center", deviced, "isNewDevice", {device = msg.device})
+		if status and back  then
+			role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+		end
 	end
 	return true