diff --git a/game-server/config/genServers.ts b/game-server/config/genServers.ts index d9bb238e0..86e45b464 100644 --- a/game-server/config/genServers.ts +++ b/game-server/config/genServers.ts @@ -25,15 +25,32 @@ interface ServerConfig { name: string, host: string, clientHost: string, connect let [totalConnector, totalChat, totalRole, totalBattle, totalComBattle, totalGuild, totalActivity, totalOrder, totalGm, totalSystimer, totalGmConnector] = Array(11).fill(0); // 服务器配置：公测渠道 -const CH_SERVERS_FILE = 'yjz_ch.ts'; +// const CH_SERVERS_FILE = 'yjz_ch.ts'; -const ch1ServerConfig: ServerConfig[] = [ - { name: 'ch1', host: '172.16.4.144', clientHost: 'yjz-ch-game1.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 2, orderCnt: 2, gmCnt: 1, systimerCnt: 1, gmConnectorCnt: 0 }, - { name: 'ch2', host: '172.16.4.139', clientHost: 'yjz-ch-game2.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 3, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, - { name: 'ch3', host: '172.16.4.143', clientHost: 'yjz-ch-game3.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 2, orderCnt: 2, gmCnt: 2, systimerCnt: 0, gmConnectorCnt: 1 }, - { name: 'ch4', host: '172.16.4.175', clientHost: 'yjz-ch-game4.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, - { name: 'ch5', host: '172.16.4.172', clientHost: 'yjz-ch-game5.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, - { name: 'ch6', host: '172.16.4.170', clientHost: 'yjz-ch-game6.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, +// const ch1ServerConfig: ServerConfig[] = [ +// { name: 'ch1', host: '172.16.4.144', clientHost: 'yjz-ch-game1.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 2, orderCnt: 2, gmCnt: 1, systimerCnt: 1, gmConnectorCnt: 0 }, +// { name: 'ch2', host: '172.16.4.139', clientHost: 'yjz-ch-game2.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 3, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, +// { name: 'ch3', host: '172.16.4.143', clientHost: 'yjz-ch-game3.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 2, orderCnt: 2, gmCnt: 2, systimerCnt: 0, gmConnectorCnt: 1 }, +// { name: 'ch4', host: '172.16.4.175', clientHost: 'yjz-ch-game4.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, +// { name: 'ch5', host: '172.16.4.172', clientHost: 'yjz-ch-game5.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, +// { name: 'ch6', host: '172.16.4.170', clientHost: 'yjz-ch-game6.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, +// ]; + +// 服务器配置：自营 +const ZY_SERVERS_FILE = 'yjz_zy.ts'; + +// 不删档测试期间配置 +const zy1ServerConfig: ServerConfig[] = [ + { name: 'zy1', host: '172.16.4.140', clientHost: 'yjz-zy-game1.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 2, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, + { name: 'zy2', host: '172.16.4.146', clientHost: 'yjz-zy-game2.fdd73.com', connectorCnt: 4, chatCnt: 2, roleCnt: 4, battleCnt: 4, comBattleCnt: 1, guildCnt: 0, activityCnt: 3, orderCnt: 2, gmCnt: 1, systimerCnt: 1, gmConnectorCnt: 0 }, + { name: 'zy3', host: '172.16.4.142', clientHost: 'yjz-zy-game3.fdd73.com', connectorCnt: 2, chatCnt: 2, roleCnt: 6, battleCnt: 4, comBattleCnt: 1, guildCnt: 6, activityCnt: 0, orderCnt: 2, gmCnt: 2, systimerCnt: 0, gmConnectorCnt: 1 }, + { name: 'zy4', host: '172.16.4.145', clientHost: 'yjz-zy-game4.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 3, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, + { name: 'zy5', host: '172.16.4.141', clientHost: 'yjz-zy-game5.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, + { name: 'zy6', host: '172.16.4.174', clientHost: 'yjz-zy-game6.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, + { name: 'zy7', host: '172.16.4.173', clientHost: 'yjz-zy-game7.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, + { name: 'zy8', host: '172.16.4.169', clientHost: 'yjz-zy-game8.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, + { name: 'zy9', host: '172.16.4.176', clientHost: 'yjz-zy-game9.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, + { name: 'zy10', host: '172.16.4.171', clientHost: 'yjz-zy-game10.fdd73.com', connectorCnt: 6, chatCnt: 2, roleCnt: 6, battleCnt: 2, comBattleCnt: 1, guildCnt: 6, activityCnt: 4, orderCnt: 2, gmCnt: 0, systimerCnt: 0, gmConnectorCnt: 0 }, ]; function genServer(config: ServerConfig) { @@ -158,4 +175,5 @@ function genServers(fileName: string, serverConfig: ServerConfig[]) { } // 将 serverConfig 转换成 servers，然后写入到文件 -genServers(CH_SERVERS_FILE, ch1ServerConfig); \ No newline at end of file +// genServers(CH_SERVERS_FILE, ch1ServerConfig); +genServers(ZY_SERVERS_FILE, zy1ServerConfig); \ No newline at end of file diff --git a/game-server/config/ios_review.ts b/game-server/config/ios_review.ts new file mode 100644 index 000000000..6ed888633 --- /dev/null +++ b/game-server/config/ios_review.ts @@ -0,0 +1,33 @@ +// ios提审 +export const yjzios = { + 'connector': [ + { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'yjz-ios-review-game.fdd73.com', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true }, + ], + 'chat': [ + { 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050 }, + ], + 'role': [ + { 'id': 'role-server-1', 'host': '127.0.0.1', 'port': 6053 } + ], + 'battle': [ + { 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 } + ], + 'comBattle': [ + { 'id': 'comBattle-server-1', 'host': '127.0.0.1', 'port': 6091 } + ], + 'gm': [ + { 'id': 'gm-server-1', 'host': '127.0.0.1', 'port': 6055 } + ], + 'systimer': [ + { 'id': 'systimer-server-1', 'host': '127.0.0.1', 'port': 6056 } + ], + 'guild': [ + { 'id': 'guild-server-1', 'host': '127.0.0.1', 'port': 6061, "args": " --inspect=9239" }, + ], + 'activity': [ + { 'id': 'activity-server-1', 'host': '127.0.0.1', 'port': 6059, "args": " --inspect=9241" }, + ], + 'order': [ + { 'id': 'order-server-1', 'host': '127.0.0.1', 'port': 6060, "args": " --inspect=9242" }, + ] +}; diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index c46d4a430..561438877 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -1,5 +1,6 @@ -const { zy1, zy2, zy3, zy4, zy5, zy6, zy7, zy8, zy9, zy10, yjzios } = require("./yjz_zy"); +const { zy1, zy2, zy3, zy4, zy5, zy6, zy7, zy8, zy9, zy10 } = require("./yjz_zy"); const { ch1, ch2, ch3, ch4, ch5, ch6 } = require("./yjz_ch"); +const { yjzios } = require("ios_review"); module.exports = { 'development': { diff --git a/game-server/config/yjz_zy.ts b/game-server/config/yjz_zy.ts index face8b6c0..69b4054f5 100644 --- a/game-server/config/yjz_zy.ts +++ b/game-server/config/yjz_zy.ts @@ -496,37 +496,3 @@ export const zy10 = { { 'id': 'order-server-20', 'host': '172.16.4.171', 'port': 6062 }, ] }; - -// ios提审 -export const yjzios = { - 'connector': [ - { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'yjz-ios-review-game.fdd73.com', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true }, - ], - 'chat': [ - { 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050 }, - ], - 'role': [ - { 'id': 'role-server-1', 'host': '127.0.0.1', 'port': 6053 } - ], - 'battle': [ - { 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 } - ], - 'comBattle': [ - { 'id': 'comBattle-server-1', 'host': '127.0.0.1', 'port': 6091 } - ], - 'gm': [ - { 'id': 'gm-server-1', 'host': '127.0.0.1', 'port': 6055 } - ], - 'systimer': [ - { 'id': 'systimer-server-1', 'host': '127.0.0.1', 'port': 6056 } - ], - 'guild': [ - { 'id': 'guild-server-1', 'host': '127.0.0.1', 'port': 6061, "args": " --inspect=9239" }, - ], - 'activity': [ - { 'id': 'activity-server-1', 'host': '127.0.0.1', 'port': 6059, "args": " --inspect=9241" }, - ], - 'order': [ - { 'id': 'order-server-1', 'host': '127.0.0.1', 'port': 6060, "args": " --inspect=9242" }, - ] -};