YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-17 00:15:13 +00:00
Code Releases Wiki Activity

refactor(cafe): rename template button

Browse Source
This commit is contained in:
YoursFunny 2023-11-14 13:02:48 +08:00
parent b9e0cc3026
commit 93e8fd1f0c
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tasks/cafe/cafe.py
View File

@ -33,6 +33,8 @@ class CafeStatus(Enum):
class Cafe(UI): class Cafe(UI):
template = CLICKABLE_TEMPLATE
@staticmethod @staticmethod
def merge_points(points, threshold=3): def merge_points(points, threshold=3):
if len(points) <= 1: if len(points) <= 1:
@ -63,7 +65,7 @@ class Cafe(UI):
def _match_clickable_points(self, image, threshold=0.8): def _match_clickable_points(self, image, threshold=0.8):
image = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY) image = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
template = cv2.cvtColor(self.btn.matched_button.image, cv2.COLOR_BGR2GRAY) template = cv2.cvtColor(self.template.matched_button.image, cv2.COLOR_BGR2GRAY)
res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED) res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
loc = np.where(res >= threshold) loc = np.where(res >= threshold)
@ -78,11 +80,11 @@ class Cafe(UI):
points = self.merge_points(points) points = self.merge_points(points)
if not points: if not points:
return [] return []
area = area_offset((0, 0, self.btn.width, self.btn.height), offset) area = area_offset((0, 0, self.template.width, self.template.height), offset)
return [ return [
ClickButton( ClickButton(
button=area_offset(area, offset=point), button=area_offset(area, offset=point),
name=self.btn.name name=self.template.name
) )
for point in points for point in points
] ]
@ -189,7 +191,6 @@ class Cafe(UI):
return status return status
def run(self): def run(self):
self.btn = CLICKABLE_TEMPLATE
self.click = 0 self.click = 0
self.check = 0 self.check = 0