chore: 整理maay目录

MaaXYZ · Nov 28, 2023 · 0bbfb98 · 0bbfb98
1 parent 20b09f8
commit 0bbfb98
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -92,6 +92,7 @@ jobs:
         shell: bash
         run: |
           cmake --install build --prefix install
+          cp -r maay install/.maay
 
       - uses: actions/upload-artifact@v3
         with:
@@ -160,6 +161,7 @@ jobs:
         shell: bash
         run: |
           cmake --install build --prefix install
+          cp -r maay install/.maay
 
       - uses: actions/upload-artifact@v3
         with:
@@ -216,6 +218,7 @@ jobs:
         shell: bash
         run: |
           cmake --install build --prefix install
+          cp -r maay install/.maay
 
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.maay/repo.json b/.maay/repo.json
diff --git a/.maay/control.json → assets/maay/control.json b/.maay/control.json → assets/maay/control.json
@@ -334,7 +334,7 @@
       }
     },
     {
-      "name": "活动：行至摩卢旁卡 16 艰难",
+      "name": "活动：行至摩卢旁卡 16 艰难（活动已结束）",
       "task": "JourneytoMorPankh",
       "option": ["all_in", "eat_candy_within_24h"],
       "provide": {
@@ -351,6 +351,25 @@
           "text": "1"
         }
       }
+    },
+    {
+      "name": "活动：洞穴的囚徒 证明启示 05（活动已结束）",
+      "task": "dummyThePrisonerintheCave",
+      "option": ["all_in", "eat_candy_within_24h"],
+      "provide": {
+        "EnterTheShow": {
+          "next": "dummyThePrisonerintheCave"
+        },
+        "TargetStageName": {
+          "text": "dummy证明启示V"
+        },
+        "StageDifficulty": {
+          "next": "dummyStageDifficulty_None"
+        },
+        "SetReplaysTimes": {
+          "text": "1"
+        }
+      }
     }
   ]
 }
diff --git a/assets/maay/repo.json b/assets/maay/repo.json
@@ -0,0 +1,5 @@
+{
+  "resource": {
+    "default": "resource"
+  }
+}
diff --git a/.maay/resource.json → assets/maay/resource.json b/.maay/resource.json → assets/maay/resource.json
diff --git a/source/cli/main.cpp b/source/cli/main.cpp
@@ -380,7 +380,7 @@ bool proc_argv(int argc, char** argv, bool& debug, std::string& adb, std::string
                                  "17. 荒兽之野 06（洞悉 兽）\n"
                                  "18. 活动：绿湖噩梦 17 艰难（活动已结束）\n"
                                  "19. 活动：行至摩卢旁卡 16 艰难（活动已结束）\n"
-                                 "20. 活动：洞穴的囚徒 证明启示 05\n")
+                                 "20. 活动：洞穴的囚徒 证明启示 05（活动已结束）\n")
                   << std::endl
                   << std::endl
                   << utf8_to_crt("请输入要执行的任务序号，可自定义顺序，以空格分隔，例如 1 2 4 12 3: ") << std::endl;