From 0c50e00f65e8fd7dd9d12e4ac64438ee49fe61e6 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Tue, 12 Apr 2022 01:04:34 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E2=80=9C=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A8=E7=BB=93=E6=9D=9F=E2=80=9D=E8=AF=86=E5=88=AB=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/330
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/203
---
 resource/tasks.json               |  20 +++++++++++---------
 resource/template/EndOfAction.png | Bin 0 -> 2068 bytes
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 resource/template/EndOfAction.png

diff --git a/resource/tasks.json b/resource/tasks.json
index 579cba8da8..b68b58da21 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -552,19 +552,21 @@
         ]
     },
     "EndOfAction": {
-        "algorithm": "OcrDetect",
-        "text": [
-            "行动结束"
-        ],
+        "algorithm": "MatchTemplate",
+        "cache": false,
         "roi": [
-            0,
-            440,
-            440,
-            280
+            790,
+            410,
+            137,
+            141
         ],
-        "action": "doNothing",
+        "action": "DoNothing",
         "next": [
             "ClickCorner"
+        ],
+        "maskRange": [
+            60,
+            255
         ]
     },
     "StageDrops": {
diff --git a/resource/template/EndOfAction.png b/resource/template/EndOfAction.png
new file mode 100644
index 0000000000000000000000000000000000000000..e493c606d2565cd458a9e67bc5979edfcee4a5f8
GIT binary patch
literal 2068
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

literal 0
HcmV?d00001