同步代码

2020-08-15 02:11:52 +08:00 · 2020-06-10 10:46:04 +08:00 · 2020-06-09 16:59:28 +08:00 · 2020-06-04 10:34:26 +08:00 · 2020-05-11 20:44:59 +08:00 · 2020-05-06 10:22:30 +08:00
11 changed files with 19 additions and 10 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,6 @@
-[submodule "third_party/game2001"]
-	path = third_party/game2001
-	url = git@git.kingsome.cn:server/game2001.git
+[submodule "third_party/masterserver"]
+	path = third_party/masterserver
+	url = git@git.kingsome.cn:server_common/masterserver.git
+[submodule "third_party/tools"]
+	path = third_party/tools
+	url = git@git.kingsome.cn:server_common/tools.git
--- a/boundle.sh
+++ b/boundle.sh
@ -1 +1 @@
-ci_script/boundle.sh
+third_party/tools/scripts/publish_cpp_i_n/boundle.sh
--- a/1
+++ b/1
@ -1 +0,0 @@
-third_party/game2001/server/tools/scripts/ci/masterserer
--- a/common.sh
+++ b/common.sh
@ -0,0 +1,6 @@
+GAME_ID=2001
+PROJECT_NAME=masterserver${GAME_ID}
+SRC_EXE_NAME=masterserver${GAME_ID}
+SOURCE_PATH=third_party/masterserver/server/masterserver
+COMPILE_FLAGS="-DGAME_ID=${GAME_ID} ."
+PRE_COMPILE_CMD=""
--- a/manage.py
+++ b/manage.py
@ -1 +1 @@
-ci_script/manage.py
+third_party/tools/scripts/publish_cpp_i_n/manage.py
--- a/reload.sh
+++ b/reload.sh
@ -1 +1 @@
-ci_script/reload.sh
+third_party/tools/scripts/publish_cpp_i_n/reload.sh
--- a/restart.sh
+++ b/restart.sh
@ -1 +1 @@
-ci_script/restart.sh
+third_party/tools/scripts/publish_cpp_i_n/restart.sh
--- a/start_instance.sh
+++ b/start_instance.sh
@ -1 +1 @@
-ci_script/start_instance.sh
+third_party/tools/scripts/publish_cpp_i_n/start_instance.sh
--- a/third_party/game2001
+++ b/third_party/game2001
@ -1 +0,0 @@
-Subproject commit 4a50844f63ad3478bd0c4252a831e88c2d7a0414
--- a/third_party/masterserver
+++ b/third_party/masterserver
@ -0,0 +1 @@
+Subproject commit 668074da06a8edf345bbac4b86e5cc3c410085a9
--- a/third_party/tools
+++ b/third_party/tools
@ -0,0 +1 @@
+Subproject commit 8dbd9659f536a61edf384ddc5c42db0af1e682c4
Author	SHA1	Message	Date
aozhiwei	f2f9128679	同步代码	2020-08-15 02:11:52 +08:00
aozhiwei	fb8c911f78	同步代码	2020-06-10 10:46:04 +08:00
aozhiwei	d1ecd57536	同步代码	2020-06-09 16:59:28 +08:00
aozhiwei	0ae66a0c7e	同步代码	2020-06-04 10:34:26 +08:00
aozhiwei	5ee0b27671	同步代码	2020-05-11 20:44:59 +08:00
aozhiwei	eabfc80d2b	同步代码	2020-05-06 10:22:30 +08:00
wangwei01	76e3349697	同步代码	2020-03-31 14:46:11 +08:00
aozhiwei	d73b0bdaff	同步代码	2020-03-31 12:03:15 +08:00
wangwei01	35397b17d3	同步代码	2020-03-18 18:24:48 +08:00
aozhiwei	ab6f60f1c4	1	2020-03-18 16:17:53 +08:00
wangwei01	9dee7050f3	同步代码	2020-03-16 11:19:51 +08:00
aozhiwei	ca4e1e4af3	同步代码	2020-03-11 11:24:54 +08:00
wangwei01	980f86e383	同步代码	2020-03-10 11:01:27 +08:00
aozhiwei	c76fd4c572	同步代码	2020-03-09 13:18:41 +08:00
wangwei01	deb29713e0	同步代码	2020-03-05 19:10:37 +08:00
aozhiwei	4fa6d5a413	同步代码	2020-03-02 12:37:51 +08:00
aozhiwei	15f1e5cfc4	同步代码	2020-02-03 19:51:40 +08:00
wangwei01	b334196378	同步代码	2020-01-20 10:21:43 +08:00
aozhiwei	88c0b1ba30	同步代码	2020-01-19 15:02:05 +08:00
wangwei01	ba2645d48e	同步代码	2020-01-17 16:13:11 +08:00
aozhiwei	272718051d	同步代码	2020-01-17 14:45:52 +08:00
wangwei01	b0b8f15d5b	同步代码	2020-01-14 11:38:53 +08:00
aozhiwei	25d7f300f6	同步代码	2020-01-13 10:54:29 +08:00
wangwei01	487b4f1587	同步代码	2020-01-06 21:12:34 +08:00
aozhiwei	b79826887a	同步代码	2020-01-06 20:57:36 +08:00
aozhiwei	0b5e029e32	同步代码	2019-12-31 18:14:36 +08:00
wangwei01	710d971bcd	同步代码	2019-12-25 10:54:47 +08:00
wangwei01	fc6af7c514	同步代码	2019-12-13 15:37:33 +08:00
aozhiwei	8a31c679a1	同步代码	2019-12-06 17:58:07 +08:00
wangwei01	923f817969	同步代码	2019-12-05 10:54:40 +08:00
aozhiwei	77202740f8	同步代码	2019-12-03 16:44:33 +08:00
wangwei01	0295e87330	同步代码	2019-12-03 11:32:48 +08:00
aozhiwei	0863244707	1	2019-11-28 17:32:08 +08:00
aozhiwei	66ac6b8a1b	1	2019-11-28 17:31:20 +08:00
aozhiwei	6bb30bb46f	1	2019-11-28 17:30:39 +08:00
aozhiwei	1ecb8d4564	同步代码	2019-11-04 14:46:53 +08:00
aozhiwei	c31021ebf9	同步代码	2019-11-01 10:06:46 +08:00
aozhiwei	bcfeecb738	同步代码	2019-10-14 14:43:00 +08:00
aozhiwei	c80a859298	同步代码	2019-10-11 17:08:24 +08:00
aozhiwei	22fd015303	add tools directory	2019-09-04 17:27:55 +08:00
aozhiwei	72adbe8df5	1	2019-09-04 17:04:13 +08:00
aozhiwei	2866f01ba9	1	2019-09-04 17:02:34 +08:00
aozhiwei	d02894017f	add masterserver	2019-09-04 16:51:45 +08:00
aozhiwei	25d6cc9608	1	2019-09-04 16:50:47 +08:00
aozhiwei	bd02bc2d40	1	2019-09-04 16:49:15 +08:00
aozhiwei	1897e6e1bc	同步代码	2019-08-31 19:22:12 +08:00
aozhiwei	5d418354af	同步代码	2019-08-31 18:52:55 +08:00
aozhiwei	f3f68bf245	同步代码	2019-08-31 18:20:58 +08:00
aozhiwei	a97be6a4f0	同步代码	2019-08-31 17:44:39 +08:00
aozhiwei	5c046c5c6e	同步代码	2019-08-31 17:38:51 +08:00
aozhiwei	0e594f8a3d	同步代码	2019-08-31 17:26:34 +08:00
aozhiwei	2813f44f6c	同步代码	2019-08-31 16:54:37 +08:00
aozhiwei	b9cfe94bc3	同步代码	2019-08-31 16:50:21 +08:00
aozhiwei	5900ec1e7e	同步代码	2019-08-31 14:24:58 +08:00
aozhiwei	5bb2a61022	同步代码	2019-08-30 23:33:32 +08:00
aozhiwei	3404579f27	同步代码	2019-08-30 13:46:45 +08:00
aozhiwei	52bce842dc	同步代码	2019-08-30 13:38:07 +08:00
aozhiwei	00c3f4acff	同步代码	2019-08-29 20:24:28 +08:00
aozhiwei	93186af655	同步代码	2019-08-29 16:10:29 +08:00
aozhiwei	9843b5540d	同步代码	2019-08-29 14:21:42 +08:00
aozhiwei	2ad33b0cce	同步代码	2019-08-27 15:22:39 +08:00
aozhiwei	639f6cb281	同步代码	2019-08-27 13:34:37 +08:00
aozhiwei	6a4a9cad4e	同步代码	2019-08-26 17:28:58 +08:00
aozhiwei	99576c4dab	同步代码	2019-08-16 14:22:20 +08:00
aozhiwei	bfd020b400	同步代码	2019-08-16 13:51:45 +08:00
aozhiwei	0533f5f134	同步代码	2019-08-15 15:04:43 +08:00
aozhiwei	f9e32c7d3f	同步代码	2019-08-15 13:51:17 +08:00
aozhiwei	725e76c9d5	同步代码	2019-08-15 11:13:19 +08:00
aozhiwei	504011b056	同步代码	2019-08-13 15:41:31 +08:00
				`@ -1 +0,0 @@`
				`third_party/game2001/server/tools/scripts/ci/masterserer`
				`@ -1 +0,0 @@`
				`Subproject commit 4a50844f63ad3478bd0c4252a831e88c2d7a0414`
				`@ -0,0 +1 @@`
				`Subproject commit 668074da06a8edf345bbac4b86e5cc3c410085a9`
				`@ -0,0 +1 @@`
				`Subproject commit 8dbd9659f536a61edf384ddc5c42db0af1e682c4`