chore: 预更新复刻活动及惯例更新活动刷取 (#306)

MaaXYZ · Jan 16, 2025 · e7bebed · e7bebed
1 parent 14b460d
commit e7bebed
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 7 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -94,7 +94,7 @@
             "pipeline_override": {
                 "EnterTheActivityMain": {
                     "template_doc": "修改为当期活动入口的template",
-                    "template": "Combat/Activity/TheLastEveningOnEarthEnterTheShow.png"
+                    "template": "Combat/Activity/ChinatownFilmsEnterTheShow.png"
                 }
             }
         },
@@ -968,24 +968,40 @@
         "活动选择": {
             "cases": [
                 {
-                    "name": "活动：地球上最后的夜晚 20 艰难",
+                    "name": "活动：唐人街影画 19 艰难",
                     "pipeline_override": {
                         "EnterTheActivityMain": {
-                            "template": "Combat/Activity/TheLastEveningOnEarthEnterTheShow.png"
+                            "template": "Combat/Activity/ChinatownFilmsEnterTheShow.png"
+                        },
+                        "ActivityMainChapter": {
+                            "expected": [
+                                "开",
+                                "始"
+                            ],
+                            "roi": [
+                                514,
+                                547,
+                                277,
+                                104
+                            ]
                         },
                         "TargetStageName": {
-                            "expected": "20"
+                            "expected": "19"
                         },
                         "StageDifficulty": {
                             "next": "ActivityStageDifficulty"
                         }
                     }
                 },
                 {
-                    "name": "活动：朔日手记 19 艰难 （已结束）",
+                    "name": "活动：朔日手记 19 艰难 （复刻）",
                     "pipeline_override": {
-                        "ActivityEntry": {
-                            "next": "NotesOnShuoRi"
+                        "EnterTheActivityMain": {
+                            "template": "Combat/Activity/ChinatownFilmsEnterTheShow.png"
+                        },
+                        "ActivityReturn": {
+                            "enabled": true,
+                            "expected": "朔日"
                         },
                         "TargetStageName": {
                             "expected": "19"
@@ -995,6 +1011,20 @@
                         }
                     }
                 },
+                {
+                    "name": "活动：地球上最后的夜晚 20 艰难（已结束）",
+                    "pipeline_override": {
+                        "EnterTheActivityMain": {
+                            "template": "Combat/Activity/TheLastEveningOnEarthEnterTheShow.png"
+                        },
+                        "TargetStageName": {
+                            "expected": "20"
+                        },
+                        "StageDifficulty": {
+                            "next": "ActivityStageDifficulty"
+                        }
+                    }
+                },
                 {
                     "name": "活动：再见，来亚什基 16 艰难（已结束）",
                     "pipeline_override": {

diff --git a/assets/resource/base/image/Combat/Activity/ChinatownFilmsEnterTheShow.png b/assets/resource/base/image/Combat/Activity/ChinatownFilmsEnterTheShow.png
diff --git a/assets/resource/base/pipeline/combat_activity.json b/assets/resource/base/pipeline/combat_activity.json
@@ -1,13 +1,29 @@
 {
     "ActivityEntry": {
         "next": [
+            "ActivityReturn",
             "ActivityMainChapter"
         ],
         "interrupt": [
             "EnterTheActivityMain",
             "ReturnMain"
         ]
     },
+    "ActivityReturn": {
+        "recognition": "OCR",
+        "expected_code": [
+            "set in code"
+        ],
+        "enabled": false,
+        "roi": [
+            33,
+            89,
+            234,
+            479
+        ],
+        "action": "Click",
+        "next": "ActivityMainChapter"
+    },
     "EnterTheActivityMain": {
         "doc": "进入当期活动主界面",
         "recognition": "TemplateMatch",