From 8549743fcb838b8adfecaef894569b12d6ff7949 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Mon, 15 Apr 2024 11:51:32 +0800 Subject: [PATCH] init --- .gitmodules | 3 +++ README.md | 31 +++++++++++++++++++++++++++++-- build-sub.bat | 2 ++ build.bat | 1 + build_linux.bat | 29 ++++------------------------- build_mac.bat | 31 +++++-------------------------- clean.bat | 14 -------------- close.bat | 9 --------- clrlogs.bat | 14 -------------- data/DB_Task.dat | Bin 583 -> 583 bytes gen_web.bat | 21 +++++++++++++++++++++ public | 1 + robot.bat | 3 --- simple_startup.bat | 11 ----------- startup.bat | 10 +++++++++- update_deploy.bat | 6 ++++++ update_public.bat | 10 ++++++++++ 17 files changed, 91 insertions(+), 105 deletions(-) create mode 100644 .gitmodules delete mode 100644 clean.bat delete mode 100644 close.bat delete mode 100644 clrlogs.bat create mode 100644 gen_web.bat create mode 160000 public delete mode 100644 robot.bat delete mode 100644 simple_startup.bat create mode 100644 update_public.bat diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e7c37df --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "public"] + path = public + url = git@git.pogorockgames.com:mango-games/server/public.git diff --git a/README.md b/README.md index 4656841..c0c2df0 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,11 @@ 游戏业务代码 ### 子仓库 + public子仓库本项目本身并没有使用，只是用来暴露部分公共代码，供其他项目使用。 + 例如： + 1.客户端同步通信协议 + 2.客户端同步游戏配置 + #### 初始化子仓库 ``` git submodule update --init --recursive @@ -13,7 +18,29 @@ git submodule update --init --recursive git submodule update --remote ``` -#### 设置拉取主仓库同时拉取子仓库 +#### 更新并提交子仓库代码 ``` -git config --global submodule.recurse true +update_public.sh ``` + +### 脚本 +#### gen_data.bat + xlsx文件转换为json,dat文件,生成pbdata.proto,生成srvdata包 + +#### gen_go.bat + proto文件生成go文件 + +#### gen_web.bat + proto文件生成go文件 + +#### build.bat + 生成可执行文件 + +#### startup.bat + 启动游戏 + +#### update_deploy.bat + 更新部署代码 + +#### update_public.sh + 更新并提交公共代码仓库 diff --git a/build-sub.bat b/build-sub.bat index ae9a943..9aefd7f 100644 --- a/build-sub.bat +++ b/build-sub.bat @@ -1,5 +1,7 @@ @echo off + echo Build %1 task! + cd %1 go fmt go vet diff --git a/build.bat b/build.bat index 215fc6a..9ccd15d 100644 --- a/build.bat +++ b/build.bat @@ -25,5 +25,6 @@ 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!" pause diff --git a/build_linux.bat b/build_linux.bat index f589569..fbfba73 100644 --- a/build_linux.bat +++ b/build_linux.bat @@ -1,31 +1,10 @@ set CGO_ENABLED=0 set GOOS=linux set GOARCH=amd64 + go env -w GO111MODULE=off -cd gatesrv -go fmt -go build -cd ../mgrsrv -go fmt -go build -cd ../worldsrv -go fmt -go build -cd ../gamesrv -go fmt -go build -rem cd ../minigame -rem go fmt -rem go build -cd ../robot -go fmt -go build -cd ../dbproxy -go fmt -go build -cd ../ranksrv -go fmt -go build -cd .. + +build.bat + @echo "complete" pause diff --git a/build_mac.bat b/build_mac.bat index 22bc2a9..65d0a2d 100644 --- a/build_mac.bat +++ b/build_mac.bat @@ -1,31 +1,10 @@ set CGO_ENABLED=0 set GOOS=darwin set GOARCH=amd64 + go env -w GO111MODULE=off -cd routesrv -go fmt -go build -cd ../gatesrv -go fmt -go build -cd ../mgrsrv -go fmt -go build -cd ../worldsrv -go fmt -go build -cd ../gamesrv -go fmt -go build -cd ../robot -go fmt -go build -cd ../datasrv -go fmt -go build -cd ../schedulesrv -go fmt -go build -cd .. + +build.bat + @echo "complete" -pause +pause \ No newline at end of file diff --git a/clean.bat b/clean.bat deleted file mode 100644 index 92ed5b8..0000000 --- a/clean.bat +++ /dev/null @@ -1,14 +0,0 @@ -del /F/S gatesrv\gatesrv -del /F/S gatesrv\gatesrv.exe -del /F/S gamesrv\gamesrv -del /F/S gamesrv\gamesrv.exe -del /F/S mgrsrv\mgrsrv -del /F/S mgrsrv\mgrsrv.exe -del /F/S worldsrv\worldsrv -del /F/S worldsrv\worldsrv.exe -del /F/S robot\robot -del /F/S robot\robot.exe -del /F/S dbproxy\dbproxy -del /F/S dbproxy\dbproxy.exe -del /F/S minigame\minigame -del /F/S minigame\minigame.exe \ No newline at end of file diff --git a/close.bat b/close.bat deleted file mode 100644 index 7472d30..0000000 --- a/close.bat +++ /dev/null @@ -1,9 +0,0 @@ -TASKKILL /F /IM gatesrv.exe -TASKKILL /F /IM mgrsrv.exe -TASKKILL /F /IM worldsrv.exe -TASKKILL /F /IM gamesrv.exe -TASKKILL /F /IM robot.exe -TASKKILL /F /IM minigame.exe -TASKKILL /F /IM dbproxy.exe -TASKKILL /F /IM ranksrv.exe -clrlogs.bat \ No newline at end of file diff --git a/clrlogs.bat b/clrlogs.bat deleted file mode 100644 index 51c3833..0000000 --- a/clrlogs.bat +++ /dev/null @@ -1,14 +0,0 @@ -del /F/S gatesrv\*.log -del /F/S gatesrv\*.log.* -del /F/S mgrsrv\*.log -del /F/S mgrsrv\*.log.* -del /F/S worldsrv\*.log -del /F/S worldsrv\*.log.* -del /F/S gamesrv\*.log -del /F/S gamesrv\*.log.* -del /F/S dbproxy\*.log -del /F/S dbproxy\*.log.* -del /F/S minigame\*.log -del /F/S minigame\*.log.* -del /F/S robot\*.log -del /F/S robot\*.log.* \ No newline at end of file diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 62536b2383f734af85e42ca14c7690c491578ec6..55a8fc4c225465861e1b16f6c042c1e3e05c0686 100644 GIT binary patch delta 48 zcmX@ka-3zu7RJe+83h%%xMVp51z03_6<)AwFdDIOEb3(w5HaH5SO}yKwAfC5%9sQI DIeZN2 delta 62 zcmX@ka-3zu7Dib%jzzs}0$fI%91DST!`eqIT(TU30xS}|3NP3vPh=G45#f^K5CRKK O@SD7mQDia;lQRJO1`eJ8 diff --git a/gen_web.bat b/gen_web.bat new file mode 100644 index 0000000..035d7d6 --- /dev/null +++ b/gen_web.bat @@ -0,0 +1,21 @@ + +copy +@echo off +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" + +echo %protoc3% +cd %proto_path% +for /d %%s in (,*) do ( + rem if %%s NEQ webapi ( + cd %%s + for %%b in (,*.proto) do ( + echo %%b + %protoc% --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=. %%b + ) + cd .. + rem ) +) +pause \ No newline at end of file diff --git a/public b/public new file mode 160000 index 0000000..dd2f835 --- /dev/null +++ b/public @@ -0,0 +1 @@ +Subproject commit dd2f83586934e7b32c64f57f561154eb6a374656 diff --git a/robot.bat b/robot.bat deleted file mode 100644 index e3c42e6..0000000 --- a/robot.bat +++ /dev/null @@ -1,3 +0,0 @@ -set GODEBUG=gctrace=1 -cd robot -start robot.exe \ No newline at end of file diff --git a/simple_startup.bat b/simple_startup.bat deleted file mode 100644 index 3f1e931..0000000 --- a/simple_startup.bat +++ /dev/null @@ -1,11 +0,0 @@ -set GODEBUG=gctrace=1 -cd dbproxy -start dbproxy.exe -cd ../mgrsrv -start mgrsrv.exe -cd ../gatesrv -start gatesrv.exe -rem cd ../worldsrv -rem start worldsrv.exe -rem cd ../gamesrv -rem start gamesrv.exe \ No newline at end of file diff --git a/startup.bat b/startup.bat index f3aa47e..7784487 100644 --- a/startup.bat +++ b/startup.bat @@ -1,13 +1,21 @@ set GODEBUG=gctrace=1 cd dbproxy start dbproxy.exe + cd ../mgrsrv start mgrsrv.exe + cd ../gatesrv start gatesrv.exe + cd ../worldsrv start worldsrv.exe + cd ../gamesrv start gamesrv.exe + cd ../ranksrv -start ranksrv.exe \ No newline at end of file +start ranksrv.exe + +cd ../robot +start robot.exe \ No newline at end of file diff --git a/update_deploy.bat b/update_deploy.bat index 918d388..143ae79 100644 --- a/update_deploy.bat +++ b/update_deploy.bat @@ -2,16 +2,22 @@ xcopy .\data D:\gocode\ReadyUpdate\data /s /e /y xcopy .\dbproxy\dbproxy D:\gocode\ReadyUpdate /y del .\dbproxy\dbproxy + xcopy .\mgrsrv\mgrsrv D:\gocode\ReadyUpdate /y del .\mgrsrv\mgrsrv + xcopy .\gatesrv\gatesrv D:\gocode\ReadyUpdate /y del .\gatesrv\gatesrv + xcopy .\worldsrv\worldsrv D:\gocode\ReadyUpdate /y del .\worldsrv\worldsrv + xcopy .\gamesrv\gamesrv D:\gocode\ReadyUpdate /y del .\gamesrv\gamesrv + xcopy .\robot\robot D:\gocode\ReadyUpdate /y del .\robot\robot + xcopy .\ranksrv\ranksrv D:\gocode\ReadyUpdate /y del .\ranksrv\ranksrv diff --git a/update_public.bat b/update_public.bat new file mode 100644 index 0000000..176fe34 --- /dev/null +++ b/update_public.bat @@ -0,0 +1,10 @@ +@echo off +xcopy .\data .\public\data /s /e /y +xcopy .\protocol .\public\protocol /s /e /y +xcopy .\xlsx .\public\xlsx /s /e /y + +cd .\public +git add . +git commit -m "update" +git push +pause \ No newline at end of file