脚本优化

clean.bat

@@ -1,3 +1,10 @@
 @echo off
 
-call shell/clean.bat
+for /f "tokens=*" %%a in (shell/programs.txt) do (
+    if exist "%%a\*.log" del /q "%%a\*.log"
+    if exist "%%a\*.log.*" del /q "%%a\*.log.*"
+
+    echo "clean logs: %%a"
+)
+
+echo "clean logs complete!"

close.bat

@@ -1,3 +1,7 @@
 @echo off
 
-call shell/close.bat
+for /f %%i in (shell/programs.txt) do (
+    taskkill /F /IM %%i.exe
+)
+
+echo "close complete!"

gen_data.bat

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

gen_go.bat

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

protocol/server/server.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package server;
 option go_package = "mongo.games.com/game/protocol/server";
 
-import "pbdata.proto";
+import "protocol/server/pbdata.proto";
 
 enum SSPacketID {
   PACKET_SERVER_ZERO = 0;                       // 弃用消息号

protocol/webapi/webapi.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package webapi;
 option go_package = "mongo.games.com/game/protocol/webapi";
 
-import "common.proto";
+import "protocol/webapi/common.proto";
 
 /*
  * =====================================================

shell/clean.bat

@@ -1,10 +0,0 @@
-@echo off
-
-for /f "tokens=*" %%a in (shell/programs.txt) do (
-    if exist "%%a\*.log" del /q "%%a\*.log"
-    if exist "%%a\*.log.*" del /q "%%a\*.log.*"
-    
-    echo "clean logs: %%a"
-)
-
-echo "clean logs complete!"

shell/close.bat

@@ -1,7 +0,0 @@
-@echo off
-
-for /f %%i in (shell/programs.txt) do (
-    taskkill /F /IM %%i.exe
-)
-
-echo "close complete!"

shell/gen_data.bat

@@ -1,15 +0,0 @@
-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
-cd %work_path%

shell/gen_go.bat

@@ -1,16 +0,0 @@
-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\mongo.games.com\game --proto_path=. --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=%GOPATH%\src %%b
-		)
-		cd ..
-)
-cd %work_path%

shell/start.bat

@@ -1,17 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-for /f "tokens=*" %%a in (shell/programs.txt) do (
-    set program=%%a/%%a.exe
-    
-    if exist "!program!" (
-        pushd %%a
-        start "%%a" "%%a.exe"
-        popd
-        echo "start: !program!"
-    ) else (
-        echo "not found: !program!"
-    )
-)
-
-echo "start complete!"

shell/update_deploy.bat

@@ -1,12 +0,0 @@
-set deployDir="..\deploy"
-
-xcopy .\data\* %deployDir%\data\ /s /e /y
-
-for /f "tokens=*" %%a in (shell/programs.txt) do (
-    xcopy .\%%a\%%a %deployDir% /y
-    del .\%%a\%%a
-)
-
-for /f "tokens=*" %%f in (shell/exclude.txt) do (
-    if exist "%deployDir%\data\%%f" (del "%deployDir%\data\%%f")
-)

shell/update_public.bat

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

startup.bat

@@ -1,4 +1,18 @@
 set GODEBUG=gctrace=1
 @echo off
+setlocal enabledelayedexpansion
 
-call shell/start.bat
+for /f "tokens=*" %%a in (shell/programs.txt) do (
+    set program=%%a/%%a.exe
+
+    if exist "!program!" (
+        pushd %%a
+        start "%%a" "%%a.exe"
+        popd
+        echo "start: !program!"
+    ) else (
+        echo "not found: !program!"
+    )
+)
+
+echo "start complete!"

update_deploy.bat

@@ -1,3 +1,16 @@
 @echo off
-call shell/update_deploy.bat
+
+set deployDir=".\deploy"
+
+xcopy .\data\* %deployDir%\data\ /s /e /y
+
+for /f "tokens=*" %%a in (shell/programs.txt) do (
+    xcopy .\%%a\%%a %deployDir% /y
+    del .\%%a\%%a
+)
+
+for /f "tokens=*" %%f in (shell/exclude.txt) do (
+    if exist "%deployDir%\data\%%f" (del "%deployDir%\data\%%f")
+)
+
 pause

update_public.bat

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