From b4bab0de1eea56a93536bfbd9b40984cfed1049c Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Fri, 6 Sep 2024 15:58:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4public=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 --- README.md | 21 --------------------- public | 1 - shell/update_public.bat | 10 +++++----- 4 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 .gitmodules delete mode 160000 public diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e7c37df..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "public"] - path = public - url = git@git.pogorockgames.com:mango-games/server/public.git diff --git a/README.md b/README.md index 432863b..f5b2aeb 100644 --- a/README.md +++ b/README.md @@ -2,27 +2,6 @@ 游戏业务代码 -### 子仓库 - public子仓库本项目本身并没有使用，只是用来暴露部分公共代码，供其他项目使用。 - 例如： - 1.客户端同步通信协议 - 2.客户端同步游戏配置 - -#### 初始化子仓库 -``` -git submodule update --init --recursive -``` - -#### 更新子仓库 -``` -git submodule update --remote -``` - -#### 更新并提交子仓库代码 -``` -update_public.sh -``` - ### 脚本 #### gen_data.bat xlsx文件转换为json,dat文件,生成pbdata.proto,生成srvdata包 diff --git a/public b/public deleted file mode 160000 index 00b9fce..0000000 --- a/public +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793 diff --git a/shell/update_public.bat b/shell/update_public.bat index a81133b..376fa0b 100644 --- a/shell/update_public.bat +++ b/shell/update_public.bat @@ -1,11 +1,11 @@ -if exist ".\public" ( - cd .\public +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 + 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"