diff --git a/assets/en/task/CLAIMED.png b/assets/en/task/CLAIMED.png index 3068a8d..161f6cc 100644 Binary files a/assets/en/task/CLAIMED.png and b/assets/en/task/CLAIMED.png differ diff --git a/assets/en/task/COMPLETE.png b/assets/en/task/COMPLETE.png new file mode 100644 index 0000000..3068a8d Binary files /dev/null and b/assets/en/task/COMPLETE.png differ diff --git a/tasks/task/assets/assets_task.py b/tasks/task/assets/assets_task.py index e822fba..4bfb5bd 100644 --- a/tasks/task/assets/assets_task.py +++ b/tasks/task/assets/assets_task.py @@ -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), + ), +) diff --git a/tasks/task/task.py b/tasks/task/task.py index 85693df..2e0a9e6 100644 --- a/tasks/task/task.py +++ b/tasks/task/task.py @@ -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