diff --git a/.gitignore b/.gitignore index 66d65180..398fa56f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ src/server/goroutine.prof src/server/heap_after.pb.gz src/server/test/logs/* src/server/test/teLog/* +src/server/*.exe* diff --git a/src/server/conf/server.json b/src/server/conf/server.json index d77d57cb..782ff82b 100644 --- a/src/server/conf/server.json +++ b/src/server/conf/server.json @@ -14,7 +14,7 @@ "AppPath": "./app", "TELOGDIR" : "./teLog/", - "GameName": "Merge_Pet_Local", + "GameName": "pet_home_local", "ServerType":"node", @@ -26,7 +26,7 @@ "GameConfPath": "D:/Github/pet_home_server/src/server/gamedata/config/", "ListenAddr":":9001", - "CenterAddr": "127.0.0.1:9000", + "CenterAddr": "127.0.0.1:7000", "RemoteAddr":"127.0.0.1:9001", "RedisAddr":"127.0.0.1",