xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version/v0.1' of gitlab.trgame.cn:zyztech/zyz_server

Browse Source 
# Conflicts:
#	shared/resource/jsons/dic_api.json
This commit is contained in:
luying
2022-01-19 13:46:57 +08:00
parent 0f0e47d2b6 6191cad6c7
commit 47c64ca2c4
27 changed files with 86 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/config/servers.ts
+12 -1
View File
@@ -250,6 +250,7 @@ module.exports = {
{ 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3050, 'frontend': true },
{ 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3051, 'frontend': true },
{ 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3052, 'frontend': true },
{ 'id': 'connector-server-5', 'port': 4054, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3054, 'frontend': true },
],
'chat': [
{ 'id': 'chat-server-1', 'host': '172.16.4.108', 'port': 6050 },
@@ -272,7 +273,8 @@ module.exports = {
{ 'id': 'guild-server-2', 'host': '172.16.4.108', 'port': 6058, "args": " --inspect=9240" }
],
'activity': [
{ 'id': 'activity-server-1', 'host': '172.16.4.108', 'port': 6059, "args": " --inspect=9241" },
{ 'id': 'activity-server-1', 'host': '172.16.4.108', 'port': 6059 },
{ 'id': 'activity-server-2', 'host': '172.16.4.108', 'port': 6068 },
],
'order': [
{ 'id': 'order-server-1', 'host': '172.16.4.108', 'port': 6060, "args": " --inspect=9242" },
@@ -293,5 +295,14 @@ module.exports = {
'role': [
{ 'id': 'role-server-4', 'host': '172.16.4.106', 'port': 6063 },
],
'chat': [
{ 'id': 'chat-server-2', 'host': '172.16.4.106', 'port': 6069 },
],
'battle': [
{ 'id': 'battle-server-3', 'host': '172.16.4.106', 'port': 6070 },
],
'guild': [
{ 'id': 'guild-server-3', 'host': '172.16.4.106', 'port': 6071 },
],
},
};
game-server/config/sq1/log4js.ts
+8 -8
View File
@@ -7,7 +7,7 @@ module.exports = {
'type': 'file',
'filename': '/zyz_logs/log4js/con-log-${opts:serverId}.log',
'pattern': 'connector',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
@@ -16,7 +16,7 @@ module.exports = {
'rpc-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/rpc-log-${opts:serverId}.log',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
@@ -25,7 +25,7 @@ module.exports = {
'forward-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/forward-log-${opts:serverId}.log',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
@@ -34,7 +34,7 @@ module.exports = {
'rpc-debug': {
'type': 'file',
'filename': '/zyz_logs/log4js/rpc-debug-${opts:serverId}.log',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
@@ -43,7 +43,7 @@ module.exports = {
'crash-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/crash.log',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
@@ -52,7 +52,7 @@ module.exports = {
'admin-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/admin.log',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
@@ -70,7 +70,7 @@ module.exports = {
'pinus-admin': {
'type': 'file',
'filename': '/zyz_logs/log4js/pinus-admin.log',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
@@ -79,7 +79,7 @@ module.exports = {
'pinus-rpc': {
'type': 'file',
'filename': '/zyz_logs/log4js/pinus-rpc-${opts:serverId}.log',
'maxLogSize': 1048576,
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},