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

Merge branch 'master' into feature/backend

Browse Source 
# Conflicts:
#	game-server/app/servers/connector/filter/global.ts
This commit is contained in:
luying
2021-12-03 18:36:39 +08:00
parent 11bba498ce 5bd6eb573c
commit b505381fa9
25 changed files with 3682 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/config/serverProtos.ts
+3 -1
View File
@@ -83,7 +83,9 @@ module.exports = {
'optional uInt32 giftGold': 2,
'optional uInt32 gold': 3,
'optional uInt32 ap': 4,
'optional uInt32 totalPay': 5
'optional uInt32 totalPay': 5,
'optional uInt32 totalCost': 6,
'optional string roleName': 7,
},
'required string msg': 1,
'required uInt32 code': 2,
game-server/config/servers.ts
+7 -7
View File
@@ -52,9 +52,9 @@ module.exports = {
},
'production': {
'connector': [
{ 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'pinus_test.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true },
{ 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'pinus_test.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true },
{ 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'pinus_test.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true }
{ 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'zyz_web.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true },
{ 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'zyz_web.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true },
{ 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'zyz_web.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true }
],
'chat': [
{ 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050 },
@@ -66,11 +66,11 @@ module.exports = {
{ 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 }
],
'gate': [
{ 'id': 'gate-server-1', 'host': '127.0.0.1', 'clientHost': 'pinus_test.trgame.cn', 'clientPort': 3014, 'frontend': true },
{ 'id': 'gate-server-1', 'host': '127.0.0.1', 'clientHost': 'zyz_web.trgame.cn', 'clientPort': 3014, 'frontend': true },
{
'id': 'gate-server-2',
'host': '127.0.0.1',
'clientHost': 'pinus_test.trgame.cn',
'clientHost': 'zyz_web.trgame.cn',
'clientPort': 3015,
'frontend': true
}
@@ -94,7 +94,7 @@ module.exports = {
},
'alpha': {
'connector': [
{ 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'zyz_web.trgame.cn', 'host': '172.26.145.159', 'clientPort': 3050, 'frontend': true },
{ 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'pinus_test.trgame.cn', 'host': '172.26.145.159', 'clientPort': 3050, 'frontend': true },
],
'chat': [
{ 'id': 'chat-server-1', 'host': '172.26.145.159', 'port': 6050 },
@@ -106,7 +106,7 @@ module.exports = {
{ 'id': 'battle-server-1', 'host': '172.26.145.159', 'port': 6054 }
],
'gate': [
{ 'id': 'gate-server-1', 'host': '172.26.145.159', 'clientHost': 'zyz_web.trgame.cn', 'clientPort': 3014, 'frontend': true }
{ 'id': 'gate-server-1', 'host': '172.26.145.159', 'clientHost': 'pinus_test.trgame.cn', 'clientPort': 3014, 'frontend': true }
],
'gm': [
{ 'id': 'gm-server-1', 'host': '172.26.145.159', 'port': 6055 }