From eae7fb97b7f699492204fbc413ba96268091eb00 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 6 Dec 2019 14:57:44 +0800 Subject: [PATCH 1/8] 1 --- common.sh | 4 ++-- third_party/wsproxy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.sh b/common.sh index 7c0241a..362f31a 100644 --- a/common.sh +++ b/common.sh @@ -1,6 +1,6 @@ GAME_ID=2001 PROJECT_NAME=wsproxy${GAME_ID} -SRC_EXE_NAME=wsproxy +SRC_EXE_NAME=wsproxy${GAME_ID} SOURCE_PATH=third_party/wsproxy/server/wsproxy -COMPILE_FLAGS="-DGAME_ID=${GAME_ID} -DMASTER_MODE=1 ." +COMPILE_FLAGS="-DGAME_ID=${GAME_ID} -DMASTER_MODE=1 -DRELEASE=1 ." PRE_COMPILE_CMD="" diff --git a/third_party/wsproxy b/third_party/wsproxy index fe38e25..b7aae72 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit fe38e25360a6d7d86068ab89c9260b500da568cb +Subproject commit b7aae72085e3dcf801ed9259950be59b85d0cdc2 From 6f99fb1cbcfe24a217a974aca199f4385959ea8a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 6 Dec 2019 17:58:15 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/tools | 2 +- third_party/wsproxy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/tools b/third_party/tools index df798de..11819cf 160000 --- a/third_party/tools +++ b/third_party/tools @@ -1 +1 @@ -Subproject commit df798de0c0caa5e3fbf0ef9a8616ff884022762b +Subproject commit 11819cf73b0312e89be761c16b239b6689af7fe0 diff --git a/third_party/wsproxy b/third_party/wsproxy index b7aae72..91cd2a3 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit b7aae72085e3dcf801ed9259950be59b85d0cdc2 +Subproject commit 91cd2a33ec075eff1ef5d26c4e4e723a794d0de6 From 79c8cfd74b797fdf274a2d05597d54b0b7911c19 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 11 Dec 2019 14:50:14 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/wsproxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wsproxy b/third_party/wsproxy index 91cd2a3..68bc02f 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit 91cd2a33ec075eff1ef5d26c4e4e723a794d0de6 +Subproject commit 68bc02f627ef438350aad66c55f245153fe1e04c From 0757b12bf848b2f9cfff4ff5d8399402dd49d21e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 11 Dec 2019 14:53:50 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/wsproxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wsproxy b/third_party/wsproxy index 68bc02f..fa63411 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit 68bc02f627ef438350aad66c55f245153fe1e04c +Subproject commit fa634112fbe9e1c73b2fbaf87fd30383d859957e From 205bd1776cc0abc8192af504bb56f8abf0453084 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Dec 2019 10:33:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/wsproxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wsproxy b/third_party/wsproxy index fa63411..e2b9fd1 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit fa634112fbe9e1c73b2fbaf87fd30383d859957e +Subproject commit e2b9fd1517580511bd7e80bfccd8296f4a88fc54 From 404c349a24a3d5836fe8fe4ddeeaccc99bae6c0f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Dec 2019 16:15:30 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/wsproxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wsproxy b/third_party/wsproxy index e2b9fd1..fb958c1 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit e2b9fd1517580511bd7e80bfccd8296f4a88fc54 +Subproject commit fb958c1a83fc2a4be2251a783b9ed8f45c0ab45f From aa5292c3b44b1df86083dc9def368639dd90c984 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Dec 2019 17:05:02 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/wsproxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wsproxy b/third_party/wsproxy index fb958c1..d4ab89a 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit fb958c1a83fc2a4be2251a783b9ed8f45c0ab45f +Subproject commit d4ab89adfbefd6bd4b01495b3c133df15ced626f From 74030bb19f20d2dc18c5379dd548a2ed26dfb433 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 13 Dec 2019 10:33:01 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/wsproxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wsproxy b/third_party/wsproxy index d4ab89a..cd6f90e 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit d4ab89adfbefd6bd4b01495b3c133df15ced626f +Subproject commit cd6f90eab89f4f62856343dce57214ac77b4c2f5