chore: 去掉base目录以免一些不必要的麻烦（

MaaXYZ · Sep 27, 2024 · 59c13cb · 59c13cb
1 parent 803bba7
commit 59c13cb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -33,4 +33,4 @@ jobs:
 
       - name: Check Resource
         run: |
-            python ./check_resource.py ./assets/resource/base/
+            python ./check_resource.py ./assets/resource/
diff --git a/assets/interface.json b/assets/interface.json
@@ -18,14 +18,14 @@
         {
             "name": "官服",
             "path": [
-                "{PROJECT_DIR}/resource/base"
+                "{PROJECT_DIR}/resource"
             ]
         },
         {
             "name": "B 服",
             "path": [
-                "{PROJECT_DIR}/resource/base",
-                "{PROJECT_DIR}/resource/bilibili"
+                "{PROJECT_DIR}/resource",
+                "{PROJECT_DIR}/resource_bilibili"
             ]
         }
     ],

diff --git a/assets/resource/base/image/empty.png → assets/resource/image/empty.png b/assets/resource/base/image/empty.png → assets/resource/image/empty.png
diff --git a/assets/resource/base/model/.gitignore → assets/resource/model/.gitignore b/assets/resource/base/model/.gitignore → assets/resource/model/.gitignore
diff --git a/assets/resource/base/pipeline/my_task.json → assets/resource/pipeline/my_task.json b/assets/resource/base/pipeline/my_task.json → assets/resource/pipeline/my_task.json
diff --git a/configure.py b/configure.py
@@ -11,7 +11,7 @@ def configure_ocr_model():
         print("请完整克隆本仓库，不要漏掉 \"--recursive\"，也不要下载 zip 包！")
         exit(1)
 
-    ocr_dir = assets_dir / "resource" / "base" / "model" / "ocr"
+    ocr_dir = assets_dir / "resource" / "model" / "ocr"
     if not ocr_dir.exists():   # copy default OCR model only if dir does not exist
         shutil.copytree(
             assets_dir / "MaaCommonAssets" / "OCR" / "ppocr_v4" / "zh_cn",