mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-13 12:37:01 +08:00
Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""
This reverts commit ac9303012c.
This commit is contained in:
@@ -92,33 +92,33 @@ class InfoHandler(ModuleBase):
|
||||
"""
|
||||
Story
|
||||
"""
|
||||
|
||||
story_popup_timout = Timer(10, count=20)
|
||||
map_has_fast_forward = False # Will be override in fast_forward.py
|
||||
|
||||
def story_skip(self):
|
||||
if self.story_popup_timout.started() and not self.story_popup_timout.reached():
|
||||
if self.handle_popup_confirm('STORY_SKIP'):
|
||||
self.story_popup_timout = Timer(10)
|
||||
self.interval_reset(STORY_SKIP)
|
||||
self.interval_reset(STORY_LETTERS_ONLY)
|
||||
return True
|
||||
if self.appear_then_click(STORY_SKIP, offset=True, interval=2):
|
||||
self.story_popup_timout.start()
|
||||
self.story_popup_timout.reset()
|
||||
return True
|
||||
if self.appear(STORY_LETTER_BLACK) and self.appear_then_click(STORY_LETTERS_ONLY, offset=True, interval=2):
|
||||
self.story_popup_timout.start()
|
||||
self.story_popup_timout.reset()
|
||||
return True
|
||||
if self.appear_then_click(STORY_CHOOSE, offset=True, interval=2):
|
||||
self.story_popup_timout.start()
|
||||
self.story_popup_timout.reset()
|
||||
return True
|
||||
if self.appear_then_click(STORY_CHOOSE_2, offset=True, interval=2):
|
||||
self.story_popup_timout.start()
|
||||
self.story_popup_timout.reset()
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def handle_story_skip(self):
|
||||
if not self.config.ENABLE_MAP_CLEAR_MODE:
|
||||
return False
|
||||
if self.config.ENABLE_FAST_FORWARD:
|
||||
if self.map_has_fast_forward:
|
||||
return False
|
||||
|
||||
return self.story_skip()
|
||||
|
||||
Reference in New Issue
Block a user