From c5adb838f35a0e6989a4d6b50d012c8028002f89 Mon Sep 17 00:00:00 2001
From: DavidWang19 <dwang0340@gmail.com>
Date: Tue, 18 Jul 2023 09:04:56 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=9C=9F?=
 =?UTF-8?q?=E8=80=8C=E9=81=87=E8=8A=82=E7=82=B9=E9=83=A8=E5=88=86=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E6=97=A0=E6=B3=95=E9=80=89=E4=B8=AD=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                           |  28 ++++++------------
 ...mi@Roguelike@StageEncounterOptionLeave.png | Bin 1358 -> 1495 bytes
 src/MaaCore/Task/Interface/DebugTask.cpp      |  20 +++++++++++++
 src/MaaCore/Task/Interface/DebugTask.h        |   1 +
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index d19c441361..a13a9ad2f6 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -8453,7 +8453,7 @@
         "specificRect": [
             1175,
             335,
-            170,
+            100,
             60
         ]
     },
@@ -8493,7 +8493,7 @@
         "specificRect": [
             1175,
             340,
-            170,
+            100,
             60
         ]
     },
@@ -8503,7 +8503,7 @@
         "specificRect": [
             1175,
             500,
-            170,
+            100,
             60
         ]
     },
@@ -8513,7 +8513,7 @@
         "specificRect": [
             1175,
             110,
-            170,
+            100,
             60
         ]
     },
@@ -8523,7 +8523,7 @@
         "specificRect": [
             1175,
             260,
-            170,
+            100,
             60
         ]
     },
@@ -8533,7 +8533,7 @@
         "specificRect": [
             1175,
             417,
-            170,
+            100,
             60
         ]
     },
@@ -8543,7 +8543,7 @@
         "specificRect": [
             1175,
             560,
-            170,
+            100,
             60
         ]
     },
@@ -10243,18 +10243,8 @@
     },
     "Sami@Roguelike@StageEncounterEnter": {},
     "Sami@Roguelike@StageEncounterLeaveConfirm": {},
-    "Sami@Roguelike@StageEncounterOptionFree": {
-        "maskRange": [
-            5,
-            255
-        ]
-    },
-    "Sami@Roguelike@StageEncounterOptionLeave": {
-        "maskRange": [
-            5,
-            255
-        ]
-    },
+    "Sami@Roguelike@StageEncounterOptionFree": {},
+    "Sami@Roguelike@StageEncounterOptionLeave": {},
     "Sami@Roguelike@StageEncounterOptionUnknown": {
         "templThreshold": 0.85
     },
diff --git a/resource/template/Sami@Roguelike@StageEncounterOptionLeave.png b/resource/template/Sami@Roguelike@StageEncounterOptionLeave.png
index e6f74a0fb49a3d11eb9585ee9c3093e2dd172836..8a8904abfea312505064dc51efd99eb76e033dd5 100644
GIT binary patch
literal 1495
zcmV;|1t|K7P)<h;3K|Lk000e1NJLTq002+`001ip1^@s6@AMC^00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L1#C$~K~!i%?VD+H
z;zkgLTLN+4m$BE_yYVKe%7^^_Uy*Oghg7QK+Su#c=CA>Crr*}!fUOH8fl|fennfC<
z(deB~cTbDevW4=T6m$MtW<Foq=k1k!-*9^~=l16FncCU}jWkVD+tygNzkHv3KDOsG
z9QUrTsOJwYmC4!Og?Wf#xnT?9Mv~%*gxYgQT5=J{{%YQEmd~PnRERL<H=3rK0?K`J
zQTIO@_GvbmNWEqxQ)cbkflk<eUv9RjcyNqC3kCPSeZ*-7TDGUE-UL)bu-J!2;OehG
zXwYlRwiY)MZ!OJcQ?<1|6$sd50bR%426fsdLWPP&f0hN*VF#r65D&;@{M<WtRBR$T
zysPpatGajSGd7Tm0%N&p!NufnF(7Lfbk@DYp|TKiQ9J-E>G@zM#7+dz&i@TveeT(i
zy?{R1s(`cU)GX|<qFdGr-Z@m#0x?|W!xoh!4zvzqrjs$<p8u)#qKlErQ03^9blrY#
zt;B)b5^ypa(zoA#Q+v@RmCaN0>=)8wF;(-Cl{irT-Lo-!0e!L;&?kEVeX<wOCy^Bp
z-h5G_Or!)v=#a`4I1c+vjW0h-sh|Exxk{bmvvefIjEsP>xIu;bA=O%E{CPl`LP<)t
zSdqZCdi;fw9HSvi93{5a8>d8#DPEHU@lTZCnWpP85lRZL2;xS9GWil!4o^hXC=rR_
zOlESFEmcK0C*-(tO+<|ff%RlG=+jI4fu5i4Ez6+$q>fw#b}h%E#1ko1V-JK&WeZZG
z0{1_dwJ^8j`aT4i=l4Lsqo01|*_Bl_&LCUzczI6U`)gGbEW29^vyuClre7^qU{>id
z@7>UJjr4e2?d_hO8xy=pl6NXzk>mZn01J}c3&=AQ_S36~$SaP91GTq%b}k@n;7jL`
zCgZWHu?KJNAoi&LtZH`8Mot6<Hpa1;Q`Xiih!0^0)48I=flkJI_|l{H^*_|_ng%=!
z)^#Fl3y4@PUu$qcTjl`R`)^_Fne*%$QNQyf%e8dANJesX*#^%$9`>nob4mSPhi21>
z`X+cn70}>VEnhp3C07u$Zvh_7@#}z|AMe=4O?c&DNL;AL;xuJ(hy5NuwlB)|1rv4I
z5t@K#5brz+wWed^et=l7Y~#9j-&xS1)Zr~29LKf@B@TqWD>gp4+9<!^I#}ygTW9hp
zPua0-Q@l-Z6%Yo#$P4{^wXSNy$4Hn1maEiwz}$moBqNXpOS4_ZdU=}}8^<f5W0-ZY
zdH4b4_R!doq^Q(vaXIFGSc?cplVa~(J2|8J$ychkexUm4S1KR1B&)LxYz4&3%U9W9
zu+78vE<hS9U#ar|9$5}xBAw-#dMFVA1dk_@EL?`qX|S{7elL0Qu&`7Hk4=HaE6eB`
zu1SJ0Sv&>x(=!olAqqksBwArJ-wTCvkcdSBHf;FXt6mtLDe@y*XkgTx<2=M?!{?5y
z4nDx`;I<HsqzgsYT%Q-7+xOJHy^=T(5ka<G<;z$<9XRIU;+%Sqx2nb)zQP!sB$?sH
zv8%Vm4{^G8*VKEskwDmr7-ljLM2QCkg8Idb7l$Ga(qB%_0>|86{4KHNI`|4>U_Y`Y
zcs_UWkUWKW<I$@m0;~#bQX0w60K@}$I^Z0<cv=jq<&zOGZ@oZ=5DFxC8RZ1BC%yX{
zYF}NL!7diFmYA7lBOSaqgpf{5cu>*D(cneZgvWow$bEwGb@CSw4{O#ARth6?rC<lV
zVww&7I!itT&3<!zXrpucU0x$>gSWdwVsp%EO}qa+1c!k%`orZpkFd4PTOhWS*UaX7
x4sVYyW({oC<JC7=4{rk2)94@ixt$dZ(Z4d^g}@2(a>4)r002ovPDHLkV1itT(Ut%J

literal 1358
zcmZ`%ZEO>D9RA<+*1Ptu?e*olzOL8ydfnEy>$O{7*1?LM>tLH>Y;nUO8+#KK#4+L~
zAX{0-izs74#5o3wXb1|(RAgiyfXsk%nrXlw8bj)oMx#;qG6;z0M?aW6zu%MJlRSAo
z{GL6vH5D?cK?(qnRVEX40w;wj#6-e&Dt>1KLb~GBaRAQl#~-xj2sho9tg8m#Wfp+`
zK>+RxQhyeJEgS&9wg3=43_$Ltu?s6>06=$YtLn?;DoUo*5Tu$QRk%Vam6H-eE|n=H
zxD1mLs1!#fQZXhGqgajrF^c4fMM#baL2x-KCFB@Rpb{Jwi4ZXg!>~$kHaa~fr`N~|
z@E9C!BkMLWZoS=QU|f28q25-25i$sZv=+u5h%v!ZCQxeUOK?(6<uP_X#sp$ip54Zm
zXv{X7KWg<y^h}|iahdXcd9HwvgDX^4UntMTi!rIrmQQ<&EuJC+>rrS85DZ(nu-Zr?
zVzIf9xBH`{&P01dCZ|uK)mwdGR7%jkkb=^i3;ZgB#a!suJ6uYg$(ZlMaGA=GN2oOB
z0*<mU5}Cs44N+!0q10HsMYK;y36ffa!QmovO)?cFr*ybnDV32B1RI^+T&oj?MF!TL
zYh_jXJR27=<#RSZN_&dzeAMC!THHYeWk8S|1*MazwG3ZkaRub+Tuh3qjTRdhw)w(j
zuEFXnws9eq&Lk3v2!+ZSET!E6C8a|#3`K=+5N6iR21^}$l;I*aUr4FdDby6>kC0Su
zeo-moEz;<W1VP|9PU%f7A8`g_GMQYh)v<x7MrU~R=+Q(#wN<DEv~ER3;$835a-VQW
zHYJ-j1E6*MJ5XgE^QR!9J(bnv=xtPv>LS%8?hOFIiONL0K6$0BrKSBcGUp~Q&JIa$
ztelC2BU9)5dhadX%R$n*#=-CW0~m_z-a7$lUfh^>tN?~nsnoJehA@pa9|k87cyS)=
zJwFKMHOKUs%*e<H5u1KM(hiRZo$Riq_e(XkGt{Aj1C8Yk4b^Mb9D%Z4Y<~XQGSSW6
z0oIhwrU=z8sC0XMdbK#(3tb~gU}Pksp~pw_%XamG;-p!;ue#@Ij{PfoRbX>pravut
zdZ+u;2ZOss-xl}ECL5gE4_`L~G1+A1<8z%qzj^!yU9xoridHzgpjo2(>=4`hWay<k
z#GU?4eRHJ~v!>}};Odu`#K`n^x_Rx=-tmLy?4Q%Gcz1B5=q__enU0symEsBbeL7Ll
zs;b%(w<g6?D_e%!PdI;|(dE;uzEc#+kEK*Q7Z+N8SxhU<52x#fvKPaAq2Z)^=xA~$
z)7G)3nk#GGmTFC|tD7vBE<Mnc7%7@jKXv`q=xFDW@dE{PP5XO?=0+|xd~ri}vqQah
zUt;0b=`&T`pADy$KA}1jk1syE<c)2Ob9mEll;-}5j33+aaP`6r?00_i^~~`TVQ7Ec
zvH09iBf~xMEnEINSVvx2HK6!3PIkWaSOlxD54W73pO~CIc>%ucJ#}eAtw(q5dZ-^b
zE813hqR(u6etnw%{$|N=S(mXsY`)r>g$Mo^|8WVIJvyI;*qYIpa(0aWL?NkqTTYEb
z3)~!%YWnE*T)MySZdV4vS@+nhh}JW-*9Ub2a?H(9Q*575F-K2%V^4c)Pe-(^yF(zr
zb9}(Vg*^UXJr|1d!Dvy)#c@%Nd+qOR@IQtPFSM`k?E8PigLi6o3kFbGUXwVztR?ji
D;YevS

diff --git a/src/MaaCore/Task/Interface/DebugTask.cpp b/src/MaaCore/Task/Interface/DebugTask.cpp
index 241423bcd6..747a5ee717 100644
--- a/src/MaaCore/Task/Interface/DebugTask.cpp
+++ b/src/MaaCore/Task/Interface/DebugTask.cpp
@@ -10,11 +10,14 @@
 #include "Vision/Battle/BattlefieldMatcher.h"
 #include "Vision/Miscellaneous/DepotImageAnalyzer.h"
 #include "Vision/Miscellaneous/StageDropsImageAnalyzer.h"
+#include "Vision/Matcher.h"
+#include "Config/TaskData.h"
 
 asst::DebugTask::DebugTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType) {}
 
 bool asst::DebugTask::run()
 {
+    test_match_template();
     return true;
 }
 
@@ -70,3 +73,20 @@ void asst::DebugTask::test_battle_image()
     analyzer.set_object_of_interest({ .deployment = true });
     analyzer.analyze();
 }
+
+void asst::DebugTask::test_match_template()
+{
+    cv::Mat image = asst::imread(utils::path("../../test/match_template/1.png"));
+    cv::Mat resized;
+    cv::resize(image, resized, cv::Size(1280, 720), 0, 0, cv::INTER_AREA);
+    Matcher match_analyzer(resized, Rect(0, 0, 1280, 720));
+    const auto& task_ptr = Task.get("Sami@Roguelike@StageEncounterOptionLeave");
+    const auto match_task_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(task_ptr);
+    match_analyzer.set_task_info(match_task_ptr);
+    match_analyzer.analyze();
+    const auto& result_opt = match_analyzer.analyze();
+    if (result_opt) {
+        const auto& result = result_opt.value().to_string();
+        Log.info(__FUNCTION__, result);
+    }
+}
diff --git a/src/MaaCore/Task/Interface/DebugTask.h b/src/MaaCore/Task/Interface/DebugTask.h
index 760d28a79e..9c4214de11 100644
--- a/src/MaaCore/Task/Interface/DebugTask.h
+++ b/src/MaaCore/Task/Interface/DebugTask.h
@@ -17,5 +17,6 @@ namespace asst
         void test_drops();
         void test_skill_ready();
         void test_battle_image();
+        void test_match_template();
     };
 }