xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-26 18:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from LmeSzinc/master

Browse Source 
Fix: Infinite click on switch when switch is unknown
This commit is contained in:
Erik 2020-06-16 19:38:57 -03:00 committed by GitHub
commit b5f97b328a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/base/switch.py
View File

@ -1,5 +1,6 @@
from module.base.base import ModuleBase from module.base.base import ModuleBase
from module.base.button import Button from module.base.button import Button
from module.base.timer import Timer
from module.logger import logger from module.logger import logger
@ -50,6 +51,7 @@ class Switch:
bool: bool:
""" """
changed = False changed = False
warning_show_timer = Timer(5, count=10).start()
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@ -65,8 +67,12 @@ class Switch:
matched = data matched = data
if current == status: if current == status:
return changed return changed
if current == 'unknown': if current == 'unknown':
logger.warning(f'Unknown {self.name} switch') if warning_show_timer.reached():
logger.warning(f'Unknown {self.name} switch')
warning_show_timer.reset()
continue
for data in self.status_list: for data in self.status_list:
if data['status'] == status: if data['status'] == status:

2
module/exercise/combat.py
View File

@ -65,7 +65,7 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment):
if self.appear_then_click(EXP_INFO_D): if self.appear_then_click(EXP_INFO_D):
continue continue
# Last D rank screen # Last D rank screen
if self.appear_then_click(OPTS_INFO_D, offset=(30,30)): if self.appear_then_click(OPTS_INFO_D, offset=(30, 30)):
continue continue
# Quit # Quit

17
module/handler/info_handler.py
View File

@ -92,16 +92,25 @@ class InfoHandler(ModuleBase):
""" """
Story Story
""" """
story_popup_timout = Timer(10, count=20)
def story_skip(self): def story_skip(self):
if self.handle_popup_confirm(): if self.story_popup_timout.started() and not self.story_popup_timout.reached():
return True if self.handle_popup_confirm('STORY_SKIP'):
self.story_popup_timout = Timer(10)
return True
if self.appear_then_click(STORY_SKIP, offset=True, interval=2): if self.appear_then_click(STORY_SKIP, offset=True, interval=2):
self.story_popup_timout.start()
return True return True
if self.appear(STORY_LETTER_BLACK) and self.appear_then_click(STORY_LETTERS_ONLY, offset=True, interval=2): if self.appear(STORY_LETTER_BLACK) and self.appear_then_click(STORY_LETTERS_ONLY, offset=True, interval=2):
self.story_popup_timout.start()
return True return True
if self.appear_then_click(STORY_CHOOSE, offset=True, interval=2): if self.appear_then_click(STORY_CHOOSE, offset=True, interval=2):
self.story_popup_timout.start()
return True return True
if self.appear_then_click(STORY_CHOOSE_2, offset=True, interval=2): if self.appear_then_click(STORY_CHOOSE_2, offset=True, interval=2):
self.story_popup_timout.start()
return True return True
return False return False
@ -109,6 +118,8 @@ class InfoHandler(ModuleBase):
def handle_story_skip(self): def handle_story_skip(self):
if not self.config.ENABLE_MAP_CLEAR_MODE: if not self.config.ENABLE_MAP_CLEAR_MODE:
return False return False
if self.config.ENABLE_FAST_FORWARD:
return False
return self.story_skip() return self.story_skip()

2
module/ui/ui.py
View File

@ -17,7 +17,7 @@ class UI(ModuleBase):
""" """
return self.appear(page.check_button, offset=(20, 20)) return self.appear(page.check_button, offset=(20, 20))
def ui_click(self, click_button, check_button, appear_button=None, offset=(20, 20), retry_wait=3, def ui_click(self, click_button, check_button, appear_button=None, offset=(20, 20), retry_wait=10,
skip_first_screenshot=False): skip_first_screenshot=False):
""" """
Args: Args: