From a1ea4a0b35b911a70c2c162ba605c445799f7aaf Mon Sep 17 00:00:00 2001
From: Windsland <86581225+Windsland52@users.noreply.github.com>
Date: Tue, 19 Nov 2024 23:56:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=82=E8=BD=BD=E8=B5=84=E6=96=99=E7=89=87=20(#253)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat: 自动取消挂载资料片
fix: 修复获取特定藏品导致进入触媒升级后卡在获得造物界面
(https://github.com/MaaXYZ/M9A/issues/251)
fix: SOD的boss战斗中有部分对话无法识别
---
 .../pipeline/activity/outside_deduction.json  | 120 ++++++++++++++++--
 1 file changed, 112 insertions(+), 8 deletions(-)

diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json
index 3ec289b4..d210f3c3 100644
--- a/assets/resource/base/pipeline/activity/outside_deduction.json
+++ b/assets/resource/base/pipeline/activity/outside_deduction.json
@@ -1,7 +1,7 @@
 {
     "SeriesOfDusks": {
         "next": [
-            "SOD_MENU",
+            "SOD_Menu",
             "SOD_Main"
         ],
         "interrupt": [
@@ -22,7 +22,24 @@
         "action": "Click",
         "post_wait_freezes": 300
     },
-    "SOD_MENU": {
+    "SOD_Menu": {
+        "recognition": "TemplateMatch",
+        "template": "OutsideDeduction/SOD_Menu.png",
+        "roi": [
+            196,
+            169,
+            355,
+            161
+        ],
+        "next": [
+            "SOD_UNOPENED",
+            "SOD_Main"
+        ],
+        "interrupt": [
+            "SOD_unmount"
+        ]
+    },
+    "SOD_MenuFlag": {
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_MENU.png",
         "roi": [
@@ -30,11 +47,72 @@
             169,
             355,
             161
+        ]
+    },
+    "SOD_unmount": {
+        "recognition": "OCR",
+        "expected": "资料片",
+        "roi": [
+            396,
+            88,
+            63,
+            27
         ],
+        "only_rec": true,
+        "action": "Click",
+        "next": [
+            "SOD_unmount_completed",
+            "SOD_unmount"
+        ],
+        "interrupt": [
+            "SOD_unmount_confirm"
+        ]
+    },
+    "SOD_unmount_completed": {
+        "recognition": "OCR",
+        "expected": "^挂载$",
+        "roi": [
+            1016,
+            620,
+            124,
+            38
+        ],
+        "only_rec": true,
+        "post_wait_freezes": 300,
+        "next": [
+            "SOD_MenuFlag"
+        ],
+        "interrupt": [
+            "BackButton"
+        ]
+    },
+    "SOD_unmount_confirm": {
+        "recognition": "OCR",
+        "expected": "^取消挂载$",
+        "roi": [
+            1016,
+            620,
+            124,
+            38
+        ],
+        "only_rec": true,
+        "action": "Click"
+    },
+    "SOD_UNOPENED": {
+        "recognition": "OCR",
+        "expected": "UNOPENED",
+        "roi": [
+            1041,
+            426,
+            122,
+            24
+        ],
+        "only_rec": true,
         "next": [
             "SODStop",
             "SODStart",
-            "SOD_Main"
+            "SOD_Main",
+            "SOD_UNOPENED"
         ]
     },
     "SODStop": {
@@ -1620,6 +1698,9 @@
         "next": [
             "SOD_NewArcanist",
             "SOD_Levelup"
+        ],
+        "interrupt": [
+            "SOD_Acquire_NoNext"
         ]
     },
     "SOD_Move": {
@@ -1726,6 +1807,7 @@
         ]
     },
     "SOD_Combating": {
+        "doc": "考虑到对话框可能出现，也可能不出现，匹配太多，故选择点击空白",
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Combating.png",
         "roi": [
@@ -1735,13 +1817,16 @@
             64
         ],
         "timeout": 40000,
-        "post_delay": 3000,
+        "post_delay": 1000,
+        "action": "Click",
+        "target": [
+            254,
+            146,
+            89,
+            73
+        ],
         "next": [
             "SOD_CombatVictory",
-            "Sub_SOD_Dialog_1",
-            "Sub_SOD_Dialog_2",
-            "Sub_SOD_Dialog_3",
-            "Sub_SOD_Dialog_4",
             "SOD_CombatDefeat_hint",
             "SOD_CombatDefeat",
             "SOD_ItemSellct_1",
@@ -2255,6 +2340,25 @@
             "SOD_Nothinghappen"
         ]
     },
+    "SOD_Acquire_NoNext": {
+        "recognition": "OCR",
+        "expected": [
+            "获得造物"
+        ],
+        "roi": [
+            535,
+            4,
+            224,
+            68
+        ],
+        "action": "Click",
+        "target": [
+            637,
+            642,
+            20,
+            20
+        ]
+    },
     "SOD_Main": {
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Main.png",