1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 19:55:12 +00:00

fix: task

This commit is contained in:
RedDeadDepresso 2023-12-26 19:24:24 +00:00 committed by YoursFunny
parent a241484e24
commit 151a085a9c
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
4 changed files with 16 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
assets/en/task/COMPLETE.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@ -31,10 +31,10 @@ CLAIMED = ButtonWrapper(
),
en=Button(
file='./assets/en/task/CLAIMED.png',
area=(921, 643, 1026, 692),
search=(901, 623, 1046, 712),
color=(127, 131, 135),
button=(921, 643, 1026, 692),
area=(937, 641, 1010, 696),
search=(917, 621, 1030, 716),
color=(212, 212, 211),
button=(937, 641, 1010, 696),
),
)
CLAIMED_ALL = ButtonWrapper(
@ -71,3 +71,14 @@ CLAIM_ALL = ButtonWrapper(
button=(1054, 642, 1243, 700),
),
)
COMPLETE = ButtonWrapper(
name='COMPLETE',
jp=None,
en=Button(
file='./assets/en/task/COMPLETE.png',
area=(921, 643, 1026, 692),
search=(901, 623, 1046, 712),
color=(127, 131, 135),
button=(921, 643, 1026, 692),
),
)

View File

@ -23,7 +23,7 @@ class Task(UI):
self.device.click(CLAIM)
logger.info("Click Claim")
continue
if self.match_color(CLAIMED) and self.match_color(CLAIMED_ALL):
if (self.match_color(CLAIMED) or self.match_color(COMPLETE)) and self.match_color(CLAIMED_ALL):
logger.info("All claimed")
break