diff --git a/server/bin/monitor.sh b/server/bin/monitor.sh deleted file mode 100644 index bb8ac6a..0000000 --- a/server/bin/monitor.sh +++ /dev/null @@ -1,11 +0,0 @@ -path_arr=$(echo $PWD|tr '/' '\n') -path_arr=(${path_arr}) -GAME_ID=${path_arr[-5]} - -if echo $GAME_ID | grep -q '[^0-9]' -then - echo 'game_id参数必须为数字' - exit 1 -fi - -python ../../third_party/tools/scripts/server/monitor.py wsproxy${GAME_ID} '-n1 -i1' diff --git a/server/bin/wsproxy/2006_test_config/zone1/node1/kcp_conf.json b/server/bin/wsproxy/2006_test_config/zone1/node1/kcp_conf.json new file mode 100644 index 0000000..6f16498 --- /dev/null +++ b/server/bin/wsproxy/2006_test_config/zone1/node1/kcp_conf.json @@ -0,0 +1,14 @@ +{ + "open": 0, + + "sndwnd": 128, + "rcvwnd": 128, + + "nodelay": 2, + "interval": 10, + "resend": 2, + "nc": 1, + + "rx_minrto": 10, + "fastresend": 1 +} diff --git a/server/bin/wsproxy/2006_test_config/zone1/node1/masterserver.cluster.json b/server/bin/wsproxy/2006_test_config/zone1/node1/masterserver.cluster.json new file mode 100644 index 0000000..dbe3bc8 --- /dev/null +++ b/server/bin/wsproxy/2006_test_config/zone1/node1/masterserver.cluster.json @@ -0,0 +1,7 @@ +[ + { + "instance_id": 1, + "ip": "127.0.0.1", + "port": 7621 + } +] diff --git a/server/bin/wsproxy/2006_test_config/zone1/node1/wsproxy.cluster.json b/server/bin/wsproxy/2006_test_config/zone1/node1/wsproxy.cluster.json new file mode 100644 index 0000000..6f4ce07 --- /dev/null +++ b/server/bin/wsproxy/2006_test_config/zone1/node1/wsproxy.cluster.json @@ -0,0 +1,16 @@ +[ + { + "instance_id" : 1, + "listen_ip": "127.0.0.1", + "listen_port": 7601, + "listen_udp_host": "192.144.200.110", + "listen_udp_port": 17601 + }, + { + "instance_id" : 2, + "listen_ip": "127.0.0.1", + "listen_port": 7602, + "listen_udp_host": "192.144.200.110", + "listen_udp_port": 17602 + } +] diff --git a/server/wsproxy/CMakeLists.txt b/server/wsproxy/CMakeLists.txt index 8c3beaf..7fdf533 100644 --- a/server/wsproxy/CMakeLists.txt +++ b/server/wsproxy/CMakeLists.txt @@ -74,7 +74,7 @@ aux_source_directory(. ) set(EXECUTABLE_OUTPUT_PATH - ${PROJECT_BINARY_DIR}/../bin + ${PROJECT_BINARY_DIR}/../bin/wsproxy/bin ) add_executable(