From be3fdb09884b22e81c5dfc015e9ab637a3d9f178 Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Sat, 23 Dec 2023 16:21:46 +0800 Subject: [PATCH] fix(task): check all claimed --- assets/en/task/CLAIMED.png | Bin 0 -> 6730 bytes assets/en/task/CLAIMED_ALL.png | Bin 0 -> 11444 bytes tasks/task/assets/assets_task.py | 22 ++++++++++++++++++++++ tasks/task/task.py | 5 ++++- 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 assets/en/task/CLAIMED.png create mode 100644 assets/en/task/CLAIMED_ALL.png diff --git a/assets/en/task/CLAIMED.png b/assets/en/task/CLAIMED.png new file mode 100644 index 0000000000000000000000000000000000000000..161f6cccdd4a3bd0946747d2a5e540f4f5dbf988 GIT binary patch literal 6730 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 Y6@PUjUPDo!LVP&bIgzjK^8fC?0mCIcf&c&j literal 0 HcmV?d00001 diff --git a/assets/en/task/CLAIMED_ALL.png b/assets/en/task/CLAIMED_ALL.png new file mode 100644 index 0000000000000000000000000000000000000000..d556ddbd9c8a3d75218080cf7ed2ba6c5ed128ce GIT binary patch literal 11444 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 M+d#_C{`%X00RjfgumAu6 literal 0 HcmV?d00001 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)