diff --git a/assets/share/daily/trial/BEGINNER_GACHA_CHECK.png b/assets/share/daily/trial/BEGINNER_GACHA_CHECK.png new file mode 100644 index 000000000..1ca68b32c Binary files /dev/null and b/assets/share/daily/trial/BEGINNER_GACHA_CHECK.png differ diff --git a/tasks/daily/assets/assets_daily_trial.py b/tasks/daily/assets/assets_daily_trial.py index ab347dc6d..5149d314e 100644 --- a/tasks/daily/assets/assets_daily_trial.py +++ b/tasks/daily/assets/assets_daily_trial.py @@ -3,6 +3,16 @@ # This file was auto-generated, do not modify it manually. To generate: # ``` python -m dev_tools.button_extract ``` +BEGINNER_GACHA_CHECK = ButtonWrapper( + name='BEGINNER_GACHA_CHECK', + share=Button( + file='./assets/share/daily/trial/BEGINNER_GACHA_CHECK.png', + area=(209, 428, 309, 460), + search=(189, 408, 329, 480), + color=(87, 139, 198), + button=(209, 428, 309, 460), + ), +) CHARACTER_TRIAL = ButtonWrapper( name='CHARACTER_TRIAL', share=Button( diff --git a/tasks/daily/trail.py b/tasks/daily/trail.py index a07459f8f..1b2d8d611 100644 --- a/tasks/daily/trail.py +++ b/tasks/daily/trail.py @@ -66,6 +66,7 @@ def enter_himeko_trial(self): and self.match_color(CHARACTER_TRIAL, interval=2): self.device.click(CHARACTER_TRIAL) continue + # Switch to regular gacha if self.match_template_color(REGULAR_GACHA_CLICK, interval=2): # Poor sleep indeed, clicks won't be response unless other elements are loaded # Waiting for gacha banner moving @@ -74,6 +75,14 @@ def enter_himeko_trial(self): first_gacha = False self.device.click(REGULAR_GACHA_CLICK) continue + # Slide down to find regular gacha if beginner gacha found + if self.match_template_color(BEGINNER_GACHA_CHECK,interval=4): + swipe_vector = (0, -4*REGULAR_GACHA_CLICK.height) + self.device.swipe_vector(swipe_vector, box=REGULAR_GACHA_CLICK.search, + random_range=(-10, -10, 10, 10), name='FIND_REGULAR_GACHA_DRAG') + continue + + def exit_trial(self, skip_first_screenshot=True): """