From 34208763aa868b4ccdbf10520d08db4107faa2c8 Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Sat, 11 Nov 2023 17:08:30 +0800 Subject: [PATCH] refactor(cafe): adjust crop template button --- assets/jp/cafe/CLICKABLE_TEMPLATE.png | Bin 1128 -> 4014 bytes tasks/cafe/cafe.py | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/jp/cafe/CLICKABLE_TEMPLATE.png b/assets/jp/cafe/CLICKABLE_TEMPLATE.png index 570afc72e973e71d62309c1f30b403708166b462..fb6344bc416fe34535c99eb982c3693298339473 100644 GIT binary patch literal 4014 zcmeH}`BRfe7{@mtAP_`L2k@k|ApxO4HOLKWuo6Oo2NjSg8KojO6A(}XM5zMGNJv1G zkT_ElFoF^;5h)O%im#PJj&Qsj6$6o50s#>;eeo~oukEliJG=8d&+a_WXTQ6%>4zzY z^mMl9008ue9_~j0&_JeYZR^#LVV{X73K_JcJ^W(;&^1`?D3F(L41hk3=)T`4A%AK> z6?QUyd(&*Uyk8Ju=vWqq&LF(lbp(2G?>9=PaaMAb$8j4ILouCTv)IqUBE8#85f+Nuw?l$jmuSybBt*R zyVYFQ+8Tj10&4{RCj^)S!U`7vCXJLn9B(W!?@K{4rbNgnhx@#M_%6Q6bsgv_b9Bn_ zUR1ru){Z7(9Qclx1eK+L=C(-!Y_|B8CCsH)dgtP>3yPiq*1 zp9}e+is*|IlFFJD^a{$KO)s(oLusIAubMIF^9j!L!eyFvODDtF z)iQnaz%B_8>#ef^6(va}P!mW0VecEv4XET8Es=L4-PvL6ex7rFET@P_Oss~SY6;kw z4|R(9-Xobh08^@l6ebFG;!aY(R4eWe1`DiBW6WFq4K$m$7WtS(f(fapng zsm@#Zy}neyAnB`1+O(0Ac2B&=IaM*Z^W?;6O$R0lYs4lI`)$yGuu5g4va6+?gO4oo zvupXgK;<1;#-fs2OrwO1liKQ%yiJ=R`=E%XNm<{>8o?-8SYM_Sgf6P1%gt}y(#G_iw z#FtG1&$q1g5vP*oD3Y9EvOkz zE5Ja90&eSp1!IKL55FYGS;_-jgA_D6#({;04kR!3&6CS+du7CVf}R@;z7DwdsICnP zqQ@&rgIpc@0>_%0pVt&yntV8+2z?c!JF!Cx^t)OhYH(LxEp^UzW@U7ZNFNgSl7}J{ zNs2{TbGBS)4Z`(TLoAicXO=o2z!xV9X3Rp6E0}5C`u-H?IeQ#YgxUC5jiP6zojzSQ zD3n)jrm|(>bgL2nF8d3PGF(lZc#z`$=m71?KX-q{mH+?% delta 1122 zcmV-o1fBb?ALs}niBL{Q4GJ0x0000DNk~Le0000h0000v2m$~A03abn2azEce*_vy zL_t(oh3%N@YaCS+z<=k?Y#v=Ao20gMEm9g4tfd$#6ki|2uR=jmM2bk;&%_cj?4>Pknvon*O*=&Mf4i|RkKF;~w zbI;s+?g;IQP8kYtKl}whBd?IRKyK!*dP)KS63qC*tY?7M^IIz~lJP=rEFGr3-#Qe-5t&v0ef| z#|^zU!>frs=HMITbUa4~2t1B4!&6`-G~b5L;vqUl;6W7OAS^}N3{>D-obL0m+hbvB&9<0u&p zK~KaVzaq~#n?c}loHZQqe;-_qJ8)^cjLf#XD`ylr?C=rH_yjrl9vPY49P1&`F{6JP zeJ^3=&bZMxjlQw5j?t-*elHHRWU(81pht0F4(7lCYlj@0*-#(>bi(2h=x$JYzYZ+G zG*rF+O`Az)2z1KAfybgv+IV>!SOkGT;HEn+PxlTvdbtw><5ryce*j1QH+br}%QO!a z8}BUCeBu}e;p{cFqAmN0P=E;ui*mRg5+#3fg??UMOaC|^OTL&0G+fD=zBNK z7=S@2f(1V!M;beHhRh_J)z>ZVfqP*vd`cOZ4Nbd~1UhDsgMCndoPS0K(;_1P_k~8S zi$FgfV&*D&*b4*D1tyT=L~R2#=nW~!90z*FA`f@L15ky*xD2JqM7_fm_#HVF%EL1F zK+o9hgFRpef38#7%C-Y{;3v3-oQ}x>)A~T)wRya0Y1h6!i1+>MJLK3}$!97b=;SsI zRwJLKlCBQ|a2ckN6Ri{9bgN*hR3I1I7Vx60>`PciM$;zU=?JRO7gMc@)B$d~AKdeD z;#NxASqN&quoMac1Mc)4IM+w{wjbfy%#$G!Cv6UaIOSihfF<}1{y|>IaLZ|*0ML@n o5Exj18))}#^W4?-*#57`zuEXR-<~+h$N&HU07*qoM6N<$f@n(kx&QzG diff --git a/tasks/cafe/cafe.py b/tasks/cafe/cafe.py index d3dbfdf..525069a 100644 --- a/tasks/cafe/cafe.py +++ b/tasks/cafe/cafe.py @@ -63,8 +63,7 @@ class Cafe(UI): def _match_clickable_points(self, image, threshold=0.8): image = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY) - template = self.btn.matched_button.image - template = cv2.cvtColor(template, cv2.COLOR_BGR2GRAY) + template = cv2.cvtColor(self.image_crop(self.btn), cv2.COLOR_BGR2GRAY) res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED) loc = np.where(res >= threshold)