r1
/
rg1
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
Xiao Bai 1 month ago
parent
05221b3a44 7735279e68
commit
67e0babf94
2 changed files with 36 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      .gitattributes
  2. 48
      server/cfg/standalone/cluster.json

12
.gitattributes
View File

@ -0,0 +1,12 @@
# 添加以下内容来指定特定文件类型的处理方式：
*.txt text
*.cs text
*.lua text
*.json text
*.xml text
*.config text
# 或者明确指定换行符处理：
*.txt eol=lf
# 或
*.txt eol=crlf

48
server/cfg/standalone/cluster.json
View File

@ -110,42 +110,42 @@
{"app":"DB", "instid":1, "clusterport" : 19731, "cfg":"DBServer.json", "param":""}, {"app":"DB", "instid":1, "clusterport" : 19731, "cfg":"DBServer.json", "param":""},
{"app":"HttpProxy", "instid":1, "clusterport" : 19741, "cfg":"HttpProxy.json", "param":""}, {"app":"HttpProxy", "instid":1, "clusterport" : 19741, "cfg":"HttpProxy.json", "param":""},
{"app":"Realmlist", "instid":1, "clusterport" : 19751, "cfg":"RealmlistServer.json", "param":""}, {"app":"Realmlist", "instid":1, "clusterport" : 19751, "cfg":"RealmlistServer.json", "param":""},
// {"app":"HttpProxyPay", "instid":1, "clusterport" : 19791, "cfg":"HttpProxyPay.json", "param":""}, {"app":"HttpProxyPay", "instid":1, "clusterport" : 19791, "cfg":"HttpProxyPay.json", "param":""},
{"app":"AccountBillLog","instid":1, "clusterport" : 19792, "cfg":"AccountBillLogServer.json", "param":""}, {"app":"AccountBillLog","instid":1, "clusterport" : 19792, "cfg":"AccountBillLogServer.json", "param":""},
{"app":"Operation", "instid":1, "clusterport" : 19793, "cfg":"OperationServer.json", "param":""}, {"app":"Operation", "instid":1, "clusterport" : 19793, "cfg":"OperationServer.json", "param":""},
{"app":"PlayerOp", "instid":1, "clusterport" : 19794, "cfg":"PlayerOpServer.json", "param":""} {"app":"PlayerOp", "instid":1, "clusterport" : 19794, "cfg":"PlayerOpServer.json", "param":""}
] ]
}, },
// { "groupname":"m_account_secondary", { "groupname":"m_account_secondary",
// "procs" : [ "procs" : [
// {"app":"Account", "instid":2, "clusterport" : 19711, "cfg":"AccountServer.json", "param":""}, {"app":"Account", "instid":2, "clusterport" : 19711, "cfg":"AccountServer.json", "param":""},
// {"app":"GateAccount", "instid":2, "clusterport" : 19721, "cfg":"GateServer_Account.json", "param":""}, {"app":"GateAccount", "instid":2, "clusterport" : 19721, "cfg":"GateServer_Account.json", "param":""},
// {"app":"DB", "instid":2, "clusterport" : 19731, "cfg":"DBServer.json", "param":""}, {"app":"DB", "instid":2, "clusterport" : 19731, "cfg":"DBServer.json", "param":""},
// {"app":"HttpProxy", "instid":2, "clusterport" : 19741, "cfg":"HttpProxy.json", "param":""}, {"app":"HttpProxy", "instid":2, "clusterport" : 19741, "cfg":"HttpProxy.json", "param":""},
// {"app":"Realmlist", "instid":2, "clusterport" : 19751, "cfg":"RealmlistServer.json", "param":""}, {"app":"Realmlist", "instid":2, "clusterport" : 19751, "cfg":"RealmlistServer.json", "param":""},
// {"app":"HttpProxyPay", "instid":2, "clusterport" : 19791, "cfg":"HttpProxyPay.json", "param":""}, {"app":"HttpProxyPay", "instid":2, "clusterport" : 19791, "cfg":"HttpProxyPay.json", "param":""},
// {"app":"AccountBillLog","instid":2, "clusterport" : 19792, "cfg":"AccountBillLogServer.json", "param":""}, {"app":"AccountBillLog","instid":2, "clusterport" : 19792, "cfg":"AccountBillLogServer.json", "param":""},
// {"app":"Operation", "instid":2, "clusterport" : 19793, "cfg":"OperationServer.json", "param":""}, {"app":"Operation", "instid":2, "clusterport" : 19793, "cfg":"OperationServer.json", "param":""},
// {"app":"PlayerOp", "instid":2, "clusterport" : 19794, "cfg":"PlayerOpServer.json", "param":""} {"app":"PlayerOp", "instid":2, "clusterport" : 19794, "cfg":"PlayerOpServer.json", "param":""}
// ] ]
// }, },
{ "groupname":"m_game", { "groupname":"m_game",
"procs" : [ "procs" : [
{"app":"GateGame", "instid":1, "clusterport" : 19801, "cfg":"GateServer_Game.json", "param":""}, {"app":"GateGame", "instid":1, "clusterport" : 19801, "cfg":"GateServer_Game.json", "param":""},
{"app":"Game", "instid":1, "clusterport" : 19806, "cfg":"GameServer.json", "param":""}, {"app":"Game", "instid":1, "clusterport" : 19806, "cfg":"GameServer.json", "param":""},
// {"app":"GateGame", "instid":2, "clusterport" : 19803, "cfg":"GateServer_Game.json", "param":""}, {"app":"GateGame", "instid":2, "clusterport" : 19803, "cfg":"GateServer_Game.json", "param":""},
// {"app":"Game", "instid":2, "clusterport" : 19804, "cfg":"GameServer.json", "param":""}, {"app":"Game", "instid":2, "clusterport" : 19804, "cfg":"GameServer.json", "param":""},
{"app":"World", "instid":1, "clusterport" : 19808, "cfg":"WorldServer.json", "param":""}, {"app":"World", "instid":1, "clusterport" : 19808, "cfg":"WorldServer.json", "param":""},
{"app":"GameDB", "instid":1, "clusterport" : 19810, "cfg":"GameDBServer.json", "param":""}, {"app":"GameDB", "instid":1, "clusterport" : 19810, "cfg":"GameDBServer.json", "param":""},
// {"app":"HttpProxyWorld","instid":1, "clusterport" : 19812, "cfg":"HttpProxyWorld.json", "param":""}, {"app":"HttpProxyWorld","instid":1, "clusterport" : 19812, "cfg":"HttpProxyWorld.json", "param":""},
// {"app":"Chat", "instid":1, "clusterport" : 19821, "cfg":"ChatServer.json", "param":""}, {"app":"Chat", "instid":1, "clusterport" : 19821, "cfg":"ChatServer.json", "param":""},
// {"app":"GateChat", "instid":1, "clusterport" : 19831, "cfg":"GateServer_Chat.json", "param":""}, {"app":"GateChat", "instid":1, "clusterport" : 19831, "cfg":"GateServer_Chat.json", "param":""},
// {"app":"Rank", "instid":1, "clusterport" : 19841, "cfg":"RankServer.json", "param":""}, {"app":"Rank", "instid":1, "clusterport" : 19841, "cfg":"RankServer.json", "param":""},
// {"app":"Friend", "instid":1, "clusterport" : 19871, "cfg":"FriendServer.json", "param":""}, {"app":"Friend", "instid":1, "clusterport" : 19871, "cfg":"FriendServer.json", "param":""},
// {"app":"Friend", "instid":2, "clusterport" : 19872, "cfg":"FriendServer.json", "param":""}, {"app":"Friend", "instid":2, "clusterport" : 19872, "cfg":"FriendServer.json", "param":""},
{"app":"BillLog", "instid":1, "clusterport" : 19703, "cfg":"BillLogServer.json", "param":""}, {"app":"BillLog", "instid":1, "clusterport" : 19703, "cfg":"BillLogServer.json", "param":""},
// {"app":"Mail", "instid":1, "clusterport" : 19880, "cfg":"MailServer.json", "param":""}, {"app":"Mail", "instid":1, "clusterport" : 19880, "cfg":"MailServer.json", "param":""},
// {"app":"Name", "instid":1, "clusterport" : 19820, "cfg":"NameServer.json", "param":""}, {"app":"Name", "instid":1, "clusterport" : 19820, "cfg":"NameServer.json", "param":""},
] ]
} }
], ],

Write Preview
Loading…
Cancel
Save