修复战斗节点

common/service/srvLogger.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-07-07 19:39:15
 LastEditTime: 2021-07-08 09:26:43
 LastEditors: Please set LastEditors

nodes/battle/main.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-05-31 11:12:16
 LastEditTime: 2021-06-01 10:49:54
 LastEditors: Please set LastEditors

nodes/battle/service/srvBattle.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-05-31 14:40:54
 LastEditTime: 2021-06-28 20:56:43
 LastEditors: Please set LastEditors

nodes/battle/service/srvBattleMgr.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-05-31 14:14:53
 LastEditTime: 2021-06-01 11:00:59
 LastEditors: Please set LastEditors

nodes/battlemaster/main.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-05-27 11:56:14
 LastEditTime: 2021-05-27 19:20:29
 LastEditors: Please set LastEditors

nodes/battlemaster/service/srvNodeMgr.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-05-27 14:43:17
 LastEditTime: 2021-05-31 20:52:30
 LastEditors: Please set LastEditors

nodes/global/service/backupSrv.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-06-30 20:51:28
 LastEditTime: 2021-07-02 20:50:33
 LastEditors: Please set LastEditors

nodes/match/main.lua

@@ -1,5 +1,5 @@
 --[[
-Author: zkj
+Author: neo
 Date: 2021-05-28 15:20:17
 LastEditTime: 2021-06-01 10:46:01
 LastEditors: Please set LastEditors
@@ -15,21 +15,22 @@ skynet.start(
         -- 初始化控制台
         init_nodes:init_console()
 
+        -- 日志
+        init_nodes:init_logger()
         -- 数据库
         init_nodes:init_mysql()
         -- redis
         init_nodes:init_redis()
-        -- 日志
-        init_nodes:init_logger()
         -- 配置
         init_nodes:init_config()
 
-        skynet.uniqueservice("srvMatchMgr")
+        skynet.uniqueservice("srvMatch")
+        skynet.uniqueservice("srvRoom")
 
         -- 集群
         init_nodes:init_cluster()
 
-        skynet.send(".steward", "lua", "pingMaster", "battle_master")
+        skynet.send(".steward", "lua", "node_hb_to_master")
 
         skynet.exit()
     end

run/ali-test/clustername.lua

@@ -4,5 +4,4 @@ global = "127.0.0.1:4102"
 login_1_1 = "127.0.0.1:4103"
 gate_1_1 = "127.0.0.1:4104"
 game_1_1 = "127.0.0.1:4105"
-battlemaster = "127.0.0.1:4106"
-battle_1_1 = "127.0.0.1:4107"
+match = "127.0.0.1:4106"

run/ali-test/machine.conf

@@ -1,3 +1,3 @@
 
 #启动进程配置
-nodeList = master resource global game_1_1 gate_1_1 login_1_1
+nodeList = master resource global match game_1_1 gate_1_1 login_1_1

run/ali-test/nodes.lua

@@ -18,10 +18,10 @@ root["master"] = {
 root["global"] = {
     debugPort = 8102
 }
-root["battlemaster"] = {
+root["resource"] = {
     debugPort = 8103
 }
-root["battle_1_1"] = {
+root["match"] = {
     debugPort = 8104
 }
 

run/common/match.conf

@@ -0,0 +1,18 @@
+include "public.conf"
+
+-- 节点集群名
+clusterName = "match"
+-- 节点名
+nodeName = "match"
+
+lroot = root.."nodes/"..clusterName.."/"
+luaservice = luaservice..lroot.."service/?.lua;"..lroot.."?.lua;"
+lua_path = lua_path..lroot.."?.lua;"..lroot.."service/?.lua;"..lroot.."lib/?.lua;"
+snax = luaservice
+
+start = "main"
+
+-- daemon
+if system == "linux" then
+daemon = "./skynet_"..nodeName..".pid"
+end

run/neo-test1/clustername.lua

@@ -4,5 +4,4 @@ global = "127.0.0.1:3002"
 login_1_1 = "127.0.0.1:3003"
 gate_1_1 = "127.0.0.1:3004"
 game_1_1 = "127.0.0.1:3005"
-battlemaster = "127.0.0.1:3006"
-battle_1_1 = "127.0.0.1:3007"
+match = "127.0.0.1:3006"

run/neo-test1/machine.conf

@@ -5,4 +5,4 @@ statistic_path = ./log/statistic/
 zip_statistic_path = ./log/zip_path/
 
 #启动进程配置
-nodeList = master resource global game_1_1 gate_1_1 login_1_1
+nodeList = master resource global match game_1_1 gate_1_1 login_1_1

run/neo-test1/nodes.lua

@@ -18,10 +18,10 @@ root["master"] = {
 root["global"] = {
     debugPort = 8201
 }
-root["battlemaster"] = {
+root["resource"] = {
     debugPort = 8202
 }
-root["battle_1_1"] = {
+root["match"] = {
     debugPort = 8203
 }