Compare commits

...

54 Commits

Author SHA1 Message Date
aozhiwei
1c8e4bc6b6 同步代码 2020-08-15 02:11:49 +08:00
aozhiwei
f3e45265b4 同步代码 2020-07-03 20:04:59 +08:00
aozhiwei
9beae93523 同步代码 2020-06-10 10:46:00 +08:00
aozhiwei
ada12083ad 同步代码 2020-06-09 16:59:24 +08:00
aozhiwei
dcfb936934 同步代码 2020-05-11 20:44:56 +08:00
aozhiwei
00d737a87c 同步代码 2020-05-06 10:22:18 +08:00
aozhiwei
2b3f32a2a5 1 2020-04-26 11:24:42 +08:00
aozhiwei
eff1ed7dc9 同步代码 2020-04-08 20:14:21 +08:00
aozhiwei
0033f12822 同步代码 2020-04-01 15:39:02 +08:00
wangwei01
3e0e38fd30 同步代码 2020-03-31 14:46:03 +08:00
aozhiwei
62eaa576c7 同步代码 2020-03-31 12:03:07 +08:00
wangwei01
667a4624f3 同步代码 2020-03-16 11:19:41 +08:00
aozhiwei
89a356fb75 同步代码 2020-03-11 11:24:41 +08:00
wangwei01
18288c4ae2 同步代码 2020-03-10 11:01:17 +08:00
aozhiwei
e00e6ca5a1 同步代码 2020-03-09 13:18:28 +08:00
wangwei01
20d656d7a9 同步代码 2020-03-05 19:10:27 +08:00
aozhiwei
437875a9f7 同步代码 2020-03-02 12:37:35 +08:00
aozhiwei
a87a0e1bed 同步代码 2020-02-03 19:51:34 +08:00
wangwei01
b5ed1335ba 同步代码 2020-01-20 10:21:34 +08:00
aozhiwei
882d1d76e8 同步代码 2020-01-19 15:01:58 +08:00
wangwei01
c7e7f2afc1 同步代码 2020-01-17 16:12:59 +08:00
aozhiwei
225355ff39 同步代码 2020-01-17 14:45:40 +08:00
wangwei01
f77522ded0 同步代码 2020-01-15 13:49:40 +08:00
aozhiwei
5fef999e1f 1 2020-01-15 13:24:34 +08:00
aozhiwei
dc22bb09d7 同步代码 2020-01-15 11:45:12 +08:00
wangwei01
109189e5a7 同步代码 2020-01-14 21:21:05 +08:00
wangwei01
d9abc9ff0d 同步代码 2020-01-14 19:19:28 +08:00
wangwei01
40984cf5d1 同步代码 2020-01-14 11:38:46 +08:00
aozhiwei
138872bada 同步代码 2020-01-13 10:54:23 +08:00
wangwei01
ad9f9b731d 同步代码 2020-01-08 19:56:13 +08:00
aozhiwei
5d24988582 同步代码 2020-01-08 13:41:34 +08:00
wangwei01
fe7d145a8b 同步代码 2020-01-06 21:12:24 +08:00
aozhiwei
08ed9fb81a 同步代码 2020-01-06 20:57:30 +08:00
aozhiwei
59bb98adfa 同步代码 2019-12-31 18:14:26 +08:00
wangwei01
3c31ec0e25 同步代码 2019-12-25 10:54:41 +08:00
wangwei01
9c71c7e229 同步代码 2019-12-13 15:37:23 +08:00
aozhiwei
32ebaf9e9c 同步代码 2019-12-13 10:32:50 +08:00
aozhiwei
6ca13d1fb8 同步代码 2019-12-12 17:04:52 +08:00
aozhiwei
9654922d80 同步代码 2019-12-12 16:15:21 +08:00
aozhiwei
e2556cd7fe 同步代码 2019-12-12 10:33:13 +08:00
aozhiwei
1002d82950 同步代码 2019-12-11 14:53:40 +08:00
aozhiwei
62d04ef81d 同步代码 2019-12-11 14:50:05 +08:00
aozhiwei
866f9b2fe7 同步代码 2019-12-06 17:57:56 +08:00
wangwei01
c06b02d5ac 同步代码 2019-12-05 10:54:34 +08:00
aozhiwei
285a056233 同步代码 2019-12-03 16:44:25 +08:00
wangwei01
7f46209789 同步代码 2019-12-03 11:32:40 +08:00
aozhiwei
f810137231 1 2019-11-28 17:35:51 +08:00
aozhiwei
052b77f89e add common.sh 2019-11-28 16:11:55 +08:00
aozhiwei
96eb4d201b 1 2019-11-28 16:10:00 +08:00
aozhiwei
7a4a65faa8 1 2019-11-28 16:06:16 +08:00
aozhiwei
ae42b9ece4 同步代码 2019-09-25 15:43:52 +08:00
aozhiwei
c852af34e2 同步代码 2019-09-25 10:26:39 +08:00
aozhiwei
62a0744351 同步代码 2019-08-13 15:22:37 +08:00
aozhiwei
54f9111559 同步代码 2019-08-13 11:08:58 +08:00
10 changed files with 16 additions and 7 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "third_party/wsproxy"]
path = third_party/wsproxy
url = git@git.kingsome.cn:server_common/wsproxy.git
[submodule "third_party/tools"]
path = third_party/tools
url = git@git.kingsome.cn:server_common/tools.git

View File

@ -1 +1 @@
ci_script/boundle.sh
third_party/tools/scripts/publish_cpp_i_n/boundle.sh

View File

@ -1 +0,0 @@
third_party/wsproxy/server/tools/scripts/ci/wsproxy2002

6
common.sh Normal file
View File

@ -0,0 +1,6 @@
GAME_ID=2002
PROJECT_NAME=wsproxy${GAME_ID}
SRC_EXE_NAME=wsproxy${GAME_ID}
SOURCE_PATH=third_party/wsproxy/server/wsproxy
COMPILE_FLAGS="-DGAME_ID=${GAME_ID} -DMASTER_MODE=1 -DRELEASE=1 -DASYNC_TCPCLIENT=1 ."
PRE_COMPILE_CMD=""

View File

@ -1 +1 @@
ci_script/manage.py
third_party/tools/scripts/publish_cpp_i_n/manage.py

View File

@ -1 +1 @@
ci_script/reload.sh
third_party/tools/scripts/publish_cpp_i_n/reload.sh

View File

@ -1 +1 @@
ci_script/restart.sh
third_party/tools/scripts/publish_cpp_i_n/restart.sh

View File

@ -1 +1 @@
ci_script/start_instance.sh
third_party/tools/scripts/publish_cpp_i_n/start_instance.sh

1
third_party/tools vendored Submodule

@ -0,0 +1 @@
Subproject commit 8dbd9659f536a61edf384ddc5c42db0af1e682c4

2
third_party/wsproxy vendored

@ -1 +1 @@
Subproject commit 6fbbabfd032eb0c95f5bcef5b38dba08340e619f
Subproject commit a28c9ea8a7848000eba889ee8a2dd3de9aede969