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

fix: use correct color space for template matching

Browse Source
This commit is contained in:
YoursFunny 2023-11-16 20:28:38 +08:00
parent 1a66e767f3
commit 8d2882e752
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/cafe/cafe.py
View File

@ -54,8 +54,7 @@ class Cafe(UI):
@staticmethod @staticmethod
def _extract_clickable_from_image(image): def _extract_clickable_from_image(image):
# convert to hsv for better color matching # convert to hsv for better color matching
image = cv2.cvtColor(image, cv2.COLOR_RGB2BGR) hsv = cv2.cvtColor(image, cv2.COLOR_RGB2HSV)
hsv = cv2.cvtColor(image, cv2.COLOR_BGR2HSV)
# set color range # set color range
lower_hsv = np.array([18, 200, 220]) lower_hsv = np.array([18, 200, 220])
upper_hsv = np.array([30, 255, 255]) upper_hsv = np.array([30, 255, 255])
@ -65,8 +64,8 @@ class Cafe(UI):
return cv2.bitwise_and(image, image, mask=mask) return cv2.bitwise_and(image, image, mask=mask)
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_RGB2GRAY)
template = cv2.cvtColor(self.template.matched_button.image, cv2.COLOR_BGR2GRAY) template = cv2.cvtColor(self.template.matched_button.image, cv2.COLOR_RGB2GRAY)
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)

4
tasks/stage/list.py
View File

@ -131,8 +131,8 @@ class StageList:
@staticmethod @staticmethod
def _match_clickable_points(image, template, threshold=0.85): def _match_clickable_points(image, template, threshold=0.85):
image = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY) image = cv2.cvtColor(image, cv2.COLOR_RGB2GRAY)
template = cv2.cvtColor(template, cv2.COLOR_BGR2GRAY) template = cv2.cvtColor(template, cv2.COLOR_RGB2GRAY)
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)