feat: 新增活动 朔日手记

MaaXYZ · Jan 14, 2024 · b20a993 · b20a993
1 parent 650e2d1
commit b20a993
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 2 deletions.
diff --git a/assets/.maay/control.json b/assets/.maay/control.json
@@ -390,7 +390,7 @@
       }
     },
     {
-      "name": "活动：复兴乌卢鲁运动会 13 艰难",
+      "name": "活动：复兴乌卢鲁运动会 13 艰难（活动已结束）",
       "task": "RevivalTheUluruGames",
       "option": [
         "combat_times",
@@ -408,6 +408,26 @@
           "next": "ActivityStageDifficulty"
         }
       }
+    },
+    {
+      "name": "活动：朔日手记 19 艰难",
+      "task": "NotesOnShuoRi",
+      "option": [
+        "combat_times",
+        "all_in",
+        "eat_candy_within_24h"
+      ],
+      "provide": {
+        "EnterTheShow": {
+          "next": "NotesOnShuoRi"
+        },
+        "TargetStageName": {
+          "text": "19"
+        },
+        "StageDifficulty": {
+          "next": "ActivityStageDifficulty"
+        }
+      }
     }
   ]
 }
diff --git a/assets/resource/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png b/assets/resource/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png
diff --git a/assets/resource/image/Combat/Activity/NotesOnShuoRiMainChapter.png b/assets/resource/image/Combat/Activity/NotesOnShuoRiMainChapter.png
diff --git a/assets/resource/pipeline/activity/NotesOnShuoRi.json b/assets/resource/pipeline/activity/NotesOnShuoRi.json
@@ -0,0 +1,35 @@
+{
+    "NotesOnShuoRi": {
+        "next": [
+            "NotesOnShuoRiEnterTheShow",
+            "Sub_StartUp"
+        ]
+    },
+    "NotesOnShuoRiEnterTheShow": {
+        "recognition": "TemplateMatch",
+        "template": "Combat/Activity/NotesOnShuoRiEnterTheShow.png",
+        "roi": [
+            872,
+            119,
+            333,
+            178
+        ],
+        "action": "Click",
+        "post_wait_freezes": 1,
+        "next": [
+            "NotesOnShuoRiMainChapter"
+        ]
+    },
+    "NotesOnShuoRiMainChapter": {
+        "recognition": "TemplateMatch",
+        "template": "Combat/Activity/NotesOnShuoRiMainChapter.png",
+        "roi": [
+            1029,
+            569,
+            243,
+            140
+        ],
+        "action": "Click",
+        "next": "SwipeLeftAndFindStage"
+    }
+}
diff --git a/source/cli/main.cpp b/source/cli/main.cpp
@@ -280,6 +280,14 @@ json::value combat_param(int index)
         difficulty = "ActivityStageDifficulty";
         times = "1";
         break;
+
+    case 22:
+        //"22. 活动：朔日手记 19 艰难\n"
+        chapter = "NotesOnShuoRi";
+        stage = "13";
+        difficulty = "ActivityStageDifficulty";
+        times = "1";
+        break;
     }
 
     return param;
@@ -391,7 +399,8 @@ bool proc_argv(const std::filesystem::path& config_path, int argc, char** argv,
                                  "18. 活动：绿湖噩梦 17 艰难（活动已结束）\n"
                                  "19. 活动：行至摩卢旁卡 16 艰难（活动已结束）\n"
                                  "20. 活动：洞穴的囚徒 证明启示 05（活动已结束）\n"
-                                 "21. 活动：复兴乌卢鲁运动会 13 艰难\n")
+                                 "21. 活动：复兴乌卢鲁运动会 13 艰难（活动已结束）\n"
+                                 "22. 活动：朔日手记 19 艰难\n")
                   << std::endl
                   << std::endl
                   << utf8_to_crt("请输入要执行的任务序号，可自定义顺序，以空格分隔，例如 1 2 4 12 3: ") << std::endl;
@@ -466,6 +475,11 @@ bool proc_argv(const std::filesystem::path& config_path, int argc, char** argv,
                 task_obj.param = combat_param(id);
                 break;
 
+            case 22:
+                task_obj.type = "NotesOnShuoRi";
+                task_obj.param = combat_param(id);
+                break;
+
             default:
                 std::cout << "Unknown task: " << id << std::endl;
                 return false;