diff --git a/assets/en/task/CLAIMED.png b/assets/en/task/CLAIMED.png new file mode 100644 index 0000000..161f6cc Binary files /dev/null and b/assets/en/task/CLAIMED.png differ diff --git a/assets/en/task/CLAIMED_ALL.png b/assets/en/task/CLAIMED_ALL.png new file mode 100644 index 0000000..d556ddb Binary files /dev/null and b/assets/en/task/CLAIMED_ALL.png differ diff --git a/tasks/task/assets/assets_task.py b/tasks/task/assets/assets_task.py index 9b461bb..d08f0bb 100644 --- a/tasks/task/assets/assets_task.py +++ b/tasks/task/assets/assets_task.py @@ -14,6 +14,28 @@ CLAIM = ButtonWrapper( button=(935, 639, 1015, 698), ), ) +CLAIMED = ButtonWrapper( + name='CLAIMED', + jp=None, + en=Button( + file='./assets/en/task/CLAIMED.png', + area=(937, 641, 1010, 696), + search=(917, 621, 1030, 716), + color=(212, 212, 211), + button=(937, 641, 1010, 696), + ), +) +CLAIMED_ALL = ButtonWrapper( + name='CLAIMED_ALL', + jp=None, + en=Button( + file='./assets/en/task/CLAIMED_ALL.png', + area=(1058, 641, 1240, 701), + search=(1038, 621, 1260, 720), + color=(193, 193, 196), + button=(1058, 641, 1240, 701), + ), +) CLAIM_ALL = ButtonWrapper( name='CLAIM_ALL', jp=None, diff --git a/tasks/task/task.py b/tasks/task/task.py index cbb9d27..85693df 100644 --- a/tasks/task/task.py +++ b/tasks/task/task.py @@ -4,6 +4,7 @@ from tasks.base.page import page_task from tasks.base.ui import UI from tasks.task.assets.assets_task import * + class Task(UI): def run(self): self.ui_ensure(page_task) @@ -22,6 +23,8 @@ class Task(UI): self.device.click(CLAIM) logger.info("Click Claim") continue - break + if self.match_color(CLAIMED) and self.match_color(CLAIMED_ALL): + logger.info("All claimed") + break self.config.task_delay(minute=120)