diff --git a/module/base/base.py b/module/base/base.py index b671fda64..cbacf7589 100644 --- a/module/base/base.py +++ b/module/base/base.py @@ -220,6 +220,18 @@ class ModuleBase: self.device.click(button) return appear + def appear_then_click_nocheck(self, button, ctrlcheck=False,screenshot=False, genre='items', offset=0, interval=0, similarity=0.85, + threshold=30): + button = self.ensure_button(button) + appear = self.appear(button, offset=offset, interval=interval, similarity=similarity, threshold=threshold) + if appear: + if screenshot: + self.device.sleep(self.config.WAIT_BEFORE_SAVING_SCREEN_SHOT) + self.device.screenshot() + self.device.save_screenshot(genre=genre) + self.device.click(button,control_check=ctrlcheck) + return appear + def wait_until_appear(self, button, offset=0, skip_first_screenshot=False): while 1: if skip_first_screenshot: diff --git a/module/oilkeep/oilkeep.py b/module/oilkeep/oilkeep.py index 84d2db4ef..d214e3296 100644 --- a/module/oilkeep/oilkeep.py +++ b/module/oilkeep/oilkeep.py @@ -56,7 +56,7 @@ class Oilkeep(UI): if self.appear_then_click(MAIL_OIL, offset=(30, 30), interval=3): logger.info('MAIL_OIL entered') continue - if mail_oil_add_count <= oil_add_need-1 and self.appear_then_click(MAIL_OIL_ADD, offset=(30, 30), interval=3): + if mail_oil_add_count <= oil_add_need-1 and self.appear_then_click_nocheck(MAIL_OIL_ADD, offset=(30, 30), interval=3): mail_oil_add_count += 1 logger.info('MAIL_OIL_ADD') continue