diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..c6103779 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +# 添加以下内容来指定特定文件类型的处理方式: +*.txt text +*.cs text +*.lua text +*.json text +*.xml text +*.config text + +# 或者明确指定换行符处理: +*.txt eol=lf +# 或 +*.txt eol=crlf \ No newline at end of file diff --git a/server/cfg/standalone/cluster.json b/server/cfg/standalone/cluster.json index f47291c9..42d9fcdb 100644 --- a/server/cfg/standalone/cluster.json +++ b/server/cfg/standalone/cluster.json @@ -110,42 +110,42 @@ {"app":"DB", "instid":1, "clusterport" : 19731, "cfg":"DBServer.json", "param":""}, {"app":"HttpProxy", "instid":1, "clusterport" : 19741, "cfg":"HttpProxy.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":"Operation", "instid":1, "clusterport" : 19793, "cfg":"OperationServer.json", "param":""}, {"app":"PlayerOp", "instid":1, "clusterport" : 19794, "cfg":"PlayerOpServer.json", "param":""} ] }, - // { "groupname":"m_account_secondary", - // "procs" : [ - // {"app":"Account", "instid":2, "clusterport" : 19711, "cfg":"AccountServer.json", "param":""}, - // {"app":"GateAccount", "instid":2, "clusterport" : 19721, "cfg":"GateServer_Account.json", "param":""}, - // {"app":"DB", "instid":2, "clusterport" : 19731, "cfg":"DBServer.json", "param":""}, - // {"app":"HttpProxy", "instid":2, "clusterport" : 19741, "cfg":"HttpProxy.json", "param":""}, - // {"app":"Realmlist", "instid":2, "clusterport" : 19751, "cfg":"RealmlistServer.json", "param":""}, - // {"app":"HttpProxyPay", "instid":2, "clusterport" : 19791, "cfg":"HttpProxyPay.json", "param":""}, - // {"app":"AccountBillLog","instid":2, "clusterport" : 19792, "cfg":"AccountBillLogServer.json", "param":""}, - // {"app":"Operation", "instid":2, "clusterport" : 19793, "cfg":"OperationServer.json", "param":""}, - // {"app":"PlayerOp", "instid":2, "clusterport" : 19794, "cfg":"PlayerOpServer.json", "param":""} - // ] - // }, + { "groupname":"m_account_secondary", + "procs" : [ + {"app":"Account", "instid":2, "clusterport" : 19711, "cfg":"AccountServer.json", "param":""}, + {"app":"GateAccount", "instid":2, "clusterport" : 19721, "cfg":"GateServer_Account.json", "param":""}, + {"app":"DB", "instid":2, "clusterport" : 19731, "cfg":"DBServer.json", "param":""}, + {"app":"HttpProxy", "instid":2, "clusterport" : 19741, "cfg":"HttpProxy.json", "param":""}, + {"app":"Realmlist", "instid":2, "clusterport" : 19751, "cfg":"RealmlistServer.json", "param":""}, + {"app":"HttpProxyPay", "instid":2, "clusterport" : 19791, "cfg":"HttpProxyPay.json", "param":""}, + {"app":"AccountBillLog","instid":2, "clusterport" : 19792, "cfg":"AccountBillLogServer.json", "param":""}, + {"app":"Operation", "instid":2, "clusterport" : 19793, "cfg":"OperationServer.json", "param":""}, + {"app":"PlayerOp", "instid":2, "clusterport" : 19794, "cfg":"PlayerOpServer.json", "param":""} + ] + }, { "groupname":"m_game", "procs" : [ {"app":"GateGame", "instid":1, "clusterport" : 19801, "cfg":"GateServer_Game.json", "param":""}, {"app":"Game", "instid":1, "clusterport" : 19806, "cfg":"GameServer.json", "param":""}, - // {"app":"GateGame", "instid":2, "clusterport" : 19803, "cfg":"GateServer_Game.json", "param":""}, - // {"app":"Game", "instid":2, "clusterport" : 19804, "cfg":"GameServer.json", "param":""}, + {"app":"GateGame", "instid":2, "clusterport" : 19803, "cfg":"GateServer_Game.json", "param":""}, + {"app":"Game", "instid":2, "clusterport" : 19804, "cfg":"GameServer.json", "param":""}, {"app":"World", "instid":1, "clusterport" : 19808, "cfg":"WorldServer.json", "param":""}, {"app":"GameDB", "instid":1, "clusterport" : 19810, "cfg":"GameDBServer.json", "param":""}, - // {"app":"HttpProxyWorld","instid":1, "clusterport" : 19812, "cfg":"HttpProxyWorld.json", "param":""}, - // {"app":"Chat", "instid":1, "clusterport" : 19821, "cfg":"ChatServer.json", "param":""}, - // {"app":"GateChat", "instid":1, "clusterport" : 19831, "cfg":"GateServer_Chat.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":2, "clusterport" : 19872, "cfg":"FriendServer.json", "param":""}, + {"app":"HttpProxyWorld","instid":1, "clusterport" : 19812, "cfg":"HttpProxyWorld.json", "param":""}, + {"app":"Chat", "instid":1, "clusterport" : 19821, "cfg":"ChatServer.json", "param":""}, + {"app":"GateChat", "instid":1, "clusterport" : 19831, "cfg":"GateServer_Chat.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":2, "clusterport" : 19872, "cfg":"FriendServer.json", "param":""}, {"app":"BillLog", "instid":1, "clusterport" : 19703, "cfg":"BillLogServer.json", "param":""}, - // {"app":"Mail", "instid":1, "clusterport" : 19880, "cfg":"MailServer.json", "param":""}, - // {"app":"Name", "instid":1, "clusterport" : 19820, "cfg":"NameServer.json", "param":""}, + {"app":"Mail", "instid":1, "clusterport" : 19880, "cfg":"MailServer.json", "param":""}, + {"app":"Name", "instid":1, "clusterport" : 19820, "cfg":"NameServer.json", "param":""}, ] } ],