修改构建脚本

build-sub.bat

@@ -1,13 +0,0 @@
-@echo off
-
-echo Build %1 task!
-
-cd %1
-go fmt
-go vet
-go build -v
-echo errorlevel:%errorlevel%
-if "%errorlevel%"=="0" exit
-if not "%errorlevel%"=="0" echo %1 build failed!
-pause
-exit

build.bat

@@ -1,30 +1,17 @@
 go env -w GO111MODULE=off
-@echo "go fmt common..."
-cd common
-go fmt
 
-@echo "go fmt api3th..."
+@echo off
-cd ../api3th
-go fmt
 
-@echo "go fmt model..."
+call shell/build_sub.bat dbproxy
-cd ../model
+call shell/build_sub.bat mgrsrv
-go fmt
+call shell/build_sub.bat gatesrv
-
+call shell/build_sub.bat worldsrv
-@echo "go fmt webapi..."
+call shell/build_sub.bat gamesrv
-cd ../webapi
+call shell/build_sub.bat robot
-go fmt
+call shell/build_sub.bat ranksrv
-
-@echo "go fmt lib complete!"
-
-cd ..
-start build-sub.bat dbproxy
-start build-sub.bat mgrsrv
-start build-sub.bat gatesrv
-start build-sub.bat worldsrv
-start build-sub.bat gamesrv
-start build-sub.bat robot
-start build-sub.bat ranksrv
 
 @echo "Wait all build task complete!"
+
+if %errorcode% neq 0 (
     pause
+)

build_linux.bat

@@ -2,9 +2,4 @@ set CGO_ENABLED=0
 set GOOS=linux
 set GOARCH=amd64
 
-go env -w GO111MODULE=off
+call build.bat
-
-build.bat
-
-@echo "complete"
-pause

build_mac.bat

@@ -1,10 +0,0 @@
-set CGO_ENABLED=0
-set GOOS=darwin
-set GOARCH=amd64
-
-go env -w GO111MODULE=off
-
-build.bat
-
-@echo "complete"
-pause

data/DB_GameItem.json

@@ -2773,7 +2773,7 @@
 		},
 		{
 			"Id": 77006,
-			"Name": "GAME VOUCHER",
+			"Name": "游戏点卡",
 			"ShowLocation": [
 				1,
 				1

deploy.bat

@@ -0,0 +1,34 @@
+rem 切换到develop分支
+git checkout develop
+
+rem 生成配置文件
+call shell/gen_data.bat
+
+rem 生产protocol
+call shell/gen_go.bat
+
+rem 提交public
+call update_public.bat
+
+rem 提交develop
+git add .
+git commit -m "update develop"
+
+rem 切换release
+git checkout release
+
+rem 合并develop分支
+git merge develop
+
+rem 提交release
+git add .
+git commit -m "update release"
+
+rem 编译
+call build_linux.bat
+
+rem 提交deploy仓库
+call update_deploy.bat
+
+
+

gen_data.bat

@@ -1,17 +1,3 @@
 @echo off
-set work_path=%cd%
+call shell/gen_data.bat
-set protoc=%work_path%\bin\protoc-3.19.4-win64\bin\protoc.exe
-set protoc-gen-go-plugin-path="%work_path%\bin\protoc-gen-go.exe"
-
-cd %work_path%/tools/xlsx2proto
-go build
-xlsx2proto.exe
-
-cd ../../protocol/server
-%protoc% --proto_path=%GOPATH%\src --proto_path=. --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=%GOPATH%\src pbdata.proto
-
-cd ../../tools/xlsx2binary
-go build
-xlsx2binary.exe
-
 pause

gen_go.bat

@@ -1,19 +1,3 @@
 @echo off
-set work_path=%cd%
+call shell/gen_go.bat
-set proto_path=%work_path%\protocol
-set protoc=%work_path%\bin\protoc-3.19.4-win64\bin\protoc.exe
-set protoc-gen-go-plugin-path="%work_path%\bin\protoc-gen-go.exe"
-
-echo %protoc3%
-cd %proto_path%
-for /d %%s in (,*) do (
-		cd %%s
- 		for %%b in (,*.proto) do (
- 	    	echo %%b
-	    	%protoc% --proto_path=%GOPATH%\src --proto_path=. --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=%GOPATH%\src %%b
-		)
-		cd ..
-)
-
-
 pause

public

@@ -1 +1 @@
-Subproject commit 09ee0c56be846e79afc70df68005d2f6da550dfb
+Subproject commit fcb24ec4f50716936ebb587e84867835b4dba2fc

shell/build_sub.bat

@@ -0,0 +1,10 @@
+cd %1
+echo ========= Build %1 =========
+go fmt
+go vet
+go build -v
+if %errorlevel% neq 0 (
+    echo Build failed %1.
+    set errorcode=1
+)
+cd ..

shell/gen_data.bat

@@ -0,0 +1,14 @@
+set work_path=%cd%
+set protoc=%work_path%\bin\protoc-3.19.4-win64\bin\protoc.exe
+set protoc-gen-go-plugin-path="%work_path%\bin\protoc-gen-go.exe"
+
+cd %work_path%/tools/xlsx2proto
+go build
+xlsx2proto.exe
+
+cd ../../protocol/server
+%protoc% --proto_path=%GOPATH%\src --proto_path=. --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=%GOPATH%\src pbdata.proto
+
+cd ../../tools/xlsx2binary
+go build
+xlsx2binary.exe

shell/gen_go.bat

@@ -0,0 +1,15 @@
+set work_path=%cd%
+set proto_path=%work_path%\protocol
+set protoc=%work_path%\bin\protoc-3.19.4-win64\bin\protoc.exe
+set protoc-gen-go-plugin-path="%work_path%\bin\protoc-gen-go.exe"
+
+rem echo %protoc3%
+cd %proto_path%
+for /d %%s in (,*) do (
+		cd %%s
+ 		for %%b in (,*.proto) do (
+rem 	    	echo %%b
+	    	%protoc% --proto_path=%GOPATH%\src --proto_path=. --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=%GOPATH%\src %%b
+		)
+		cd ..
+)

shell/update_public.bat

@@ -0,0 +1,15 @@
+if exist ".\public" (
+    cd .\public
+    git checkout main
+    git pull
+
+    xcopy ..\data .\data /s /e /y
+    xcopy ..\protocol .\protocol /s /e /y
+    xcopy ..\xlsx .\xlsx /s /e /y
+
+    git add .
+    git commit -m "update"
+    git push
+    cd ..
+)
+

update_public.bat

@@ -1,18 +1,3 @@
 @echo off
-
+call shell/update_public.bat
-if not exist ".\public" (
-pause
-)
-
-cd .\public
-git checkout main
-git pull
-
-xcopy ..\data .\data /s /e /y
-xcopy ..\protocol .\protocol /s /e /y
-xcopy ..\xlsx .\xlsx /s /e /y
-
-git add .
-git commit -m "update"
-git push
 pause