From 866f9b2fe752358a2131a3b23af98f4033800a6a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 6 Dec 2019 17:57:56 +0800 Subject: [PATCH 1/7] =?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 --- common.sh | 4 ++-- third_party/tools | 2 +- third_party/wsproxy | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.sh b/common.sh index ce455fa..290e10c 100644 --- a/common.sh +++ b/common.sh @@ -1,6 +1,6 @@ GAME_ID=2002 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/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 fe38e25..91cd2a3 160000 --- a/third_party/wsproxy +++ b/third_party/wsproxy @@ -1 +1 @@ -Subproject commit fe38e25360a6d7d86068ab89c9260b500da568cb +Subproject commit 91cd2a33ec075eff1ef5d26c4e4e723a794d0de6 From 62d04ef81da785f53ef17526dc89929a97b3e76d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 11 Dec 2019 14:50:05 +0800 Subject: [PATCH 2/7] =?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 1002d82950280e19746834728a0fde2b519f497c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 11 Dec 2019 14:53:40 +0800 Subject: [PATCH 3/7] =?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 e2556cd7feecb954601e7facc0a72a10968db338 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Dec 2019 10:33:13 +0800 Subject: [PATCH 4/7] =?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 9654922d80ccb9f67f6c207b3c59774e26bdbc4a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Dec 2019 16:15:21 +0800 Subject: [PATCH 5/7] =?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 6ca13d1fb8b7dbd1002c123c06c3d32218058534 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Dec 2019 17:04:52 +0800 Subject: [PATCH 6/7] =?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 32ebaf9e9c248d6918f38f7151ad501b519d2477 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 13 Dec 2019 10:32:50 +0800 Subject: [PATCH 7/7] =?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