ソースを参照

修复战斗节点

neo 1 年間 前
コミット
5eb75dcbc8

+ 1 - 1
common/service/srvLogger.lua

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

+ 1 - 1
nodes/battle/main.lua

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

+ 1 - 1
nodes/battle/service/srvBattle.lua

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

+ 1 - 1
nodes/battle/service/srvBattleMgr.lua

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

+ 1 - 1
nodes/battlemaster/main.lua

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

+ 1 - 1
nodes/battlemaster/service/srvNodeMgr.lua

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

+ 1 - 1
nodes/global/service/backupSrv.lua

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

+ 6 - 5
nodes/match/main.lua

@@ -1,5 +1,5 @@
1 1
 --[[
2
-Author: zkj
2
+Author: neo
3 3
 Date: 2021-05-28 15:20:17
4 4
 LastEditTime: 2021-06-01 10:46:01
5 5
 LastEditors: Please set LastEditors
@@ -15,21 +15,22 @@ skynet.start(
15 15
         -- 初始化控制台
16 16
         init_nodes:init_console()
17 17
 
18
+        -- 日志
19
+        init_nodes:init_logger()
18 20
         -- 数据库
19 21
         init_nodes:init_mysql()
20 22
         -- redis
21 23
         init_nodes:init_redis()
22
-        -- 日志
23
-        init_nodes:init_logger()
24 24
         -- 配置
25 25
         init_nodes:init_config()
26 26
 
27
-        skynet.uniqueservice("srvMatchMgr")
27
+        skynet.uniqueservice("srvMatch")
28
+        skynet.uniqueservice("srvRoom")
28 29
 
29 30
         -- 集群
30 31
         init_nodes:init_cluster()
31 32
 
32
-        skynet.send(".steward", "lua", "pingMaster", "battle_master")
33
+        skynet.send(".steward", "lua", "node_hb_to_master")
33 34
 
34 35
         skynet.exit()
35 36
     end

+ 1 - 2
run/ali-test/clustername.lua

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

+ 1 - 1
run/ali-test/machine.conf

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

+ 2 - 2
run/ali-test/nodes.lua

@@ -18,10 +18,10 @@ root["master"] = {
18 18
 root["global"] = {
19 19
     debugPort = 8102
20 20
 }
21
-root["battlemaster"] = {
21
+root["resource"] = {
22 22
     debugPort = 8103
23 23
 }
24
-root["battle_1_1"] = {
24
+root["match"] = {
25 25
     debugPort = 8104
26 26
 }
27 27
 

+ 18 - 0
run/common/match.conf

@@ -0,0 +1,18 @@
1
+include "public.conf"
2
+
3
+-- 节点集群名
4
+clusterName = "match"
5
+-- 节点名
6
+nodeName = "match"
7
+
8
+lroot = root.."nodes/"..clusterName.."/"
9
+luaservice = luaservice..lroot.."service/?.lua;"..lroot.."?.lua;"
10
+lua_path = lua_path..lroot.."?.lua;"..lroot.."service/?.lua;"..lroot.."lib/?.lua;"
11
+snax = luaservice
12
+
13
+start = "main"
14
+
15
+-- daemon
16
+if system == "linux" then
17
+daemon = "./skynet_"..nodeName..".pid"
18
+end

+ 1 - 2
run/neo-test1/clustername.lua

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

+ 1 - 1
run/neo-test1/machine.conf

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

+ 2 - 2
run/neo-test1/nodes.lua

@@ -18,10 +18,10 @@ root["master"] = {
18 18
 root["global"] = {
19 19
     debugPort = 8201
20 20
 }
21
-root["battlemaster"] = {
21
+root["resource"] = {
22 22
     debugPort = 8202
23 23
 }
24
-root["battle_1_1"] = {
24
+root["match"] = {
25 25
     debugPort = 8203
26 26
 }
27 27