代码规范

common/utils/nodeUtil.lua

@@ -77,7 +77,7 @@ end
 -- 分配游戏服节点/agent
 function root:user_dispatch_game_node_and_agent(uid)
 	local nodeInfo = self:call_to_node("master", ".srvNodeMgr", "user_dispatch_cluster_node", uid, "game")
-	if is_empty(nodeInfo) or is_empty(nodeInfo.nodeName) then
+	if nodeInfo == nil or is_empty(nodeInfo.nodeName) then
 		return
 	end
 	local gameNode = nodeInfo.nodeName
@@ -95,7 +95,7 @@ end
 -- 分配网关节点/agent
 function root:user_dispatch_gate_node_and_agent(uid)
 	local nodeInfo = self:call_to_node("master", ".srvNodeMgr", "user_dispatch_cluster_node", uid, "gate")
-	if is_empty(nodeInfo) or is_empty(nodeInfo.nodeName) then
+	if nodeInfo == nil or is_empty(nodeInfo.nodeName) then
 		return
 	end
 	local gameNode = nodeInfo.nodeName

nodes/game/interface/box.lua

@@ -12,6 +12,7 @@ local gameConst = require("const.gameConst")
 local itemUtil = require("utils.itemUtil")
 
 local boxAdapt = require("adapt.boxAdapt")
+local resAdapt = require("adapt.resAdapt")
 
 local bagData = require("data.bag")
 
@@ -95,7 +96,7 @@ function root:box_dream_open(role, msg)
     bagData:consume_items(uid, _costItems, keyEvent)
     -- 随机道具
     local awardList = {
-        {id = itemId, count = 1, weight = adds},
+        {id = itemId, count = 1, weight = odds},
         {id = gameConst.ITEM_ID.N1, count = 1, weight = 100 - odds}
     }
     local index = random_list_by_weight(awardList)

nodes/game/interface/room.lua

@@ -10,6 +10,7 @@ local code = require("code")
 local util_match = require("utils.util_match")
 local gameConst = require("const.gameConst")
 local nodeMgr = require("nodeMgr")
+local nodeUtil = require("utils.nodeUtil")
 
 local boxAdapt = require("adapt.boxAdapt")
 local bagData = require("data.bag")
@@ -28,7 +29,7 @@ end
 
 -- 创建房间
 function root:room_create_room(role, msg)
-    local msg = msg.playCount
+    local playCount = msg.playCount
     local battleBoxList = msg.battleBoxList
     local uid = role.uid
 

nodes/game/interface/shop.lua

@@ -49,7 +49,7 @@ function root.on_pay(role, msg)
         util_user:log_event(uid, "OrderError", extraParams)
     end
     local gid = msg.goodsId
-    local conf = goodsId and shopAdapt:goods_get_info(gid)
+    local conf = gid and shopAdapt:goods_get_info(gid)
     if is_empty(conf) then
         log.error("商城充值回调 gid =%s", gid)
         logEvent(1)

nodes/game/interface/test.lua

@@ -1,12 +1,6 @@
 -- 测试工具
 local code = require "code"
-local gameConst = require("const.gameConst")
 local timeUtil = require "utils.timeUtil"
-local honorAdapt = require("adapt.honorAdapt")
-local redisUtil = require "utils.redisUtil"
-local whiteAdapt = require "adapt.whiteAdapt"
-local nodeMgr = require "nodeMgr"
-local util_user = require("utils.util_user")
 local util_order = require("utils.util_order")
 
 local moduleData = require("data.module")

nodes/gate/service/srvSprotoAgent.lua

@@ -202,7 +202,7 @@ function CMD.recycle()
 end
 
 function CMD.update_proto()
-    protoUtil.update()
+    protoUtil:update()
 end
 
 skynet.start(
@@ -211,6 +211,9 @@ skynet.start(
             "lua",
             function(session, address, command, ...)
                 local f = CMD[command]
+                if f == nil then
+                    log.error("agent command[%s] not found", tostring(command))
+                end
                 if session > 0 then
                     skynet.ret(skynet.pack(f(...)))
                 else

nodes/master/service/srvNodeMgr.lua

@@ -69,10 +69,7 @@ function root.user_dispatch_cluster_node(uid, clusterName)
 	if is_empty(clusterName) then
 		return
 	end
-	if root.mapCluster == nil then
-		return
-	end
-	if root.mapCluster[clusterName] == nil then
+	if root.mapCluster == nil or root.mapCluster[clusterName] == nil then
 		return
 	end
 	-- 已分配