YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-17 00:15:13 +00:00
Code Releases Wiki Activity

perf(sweep): improve sweep list stability

Browse Source
This commit is contained in:
YoursFunny 2023-11-21 14:20:02 +08:00
parent 299bd6c687
commit 589b0b08ec
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/stage/list.py
View File

@ -154,27 +154,31 @@ class StageList:
sweepable: bool = True, sweepable: bool = True,
offset: tuple[int, int] = (-20, -15), offset: tuple[int, int] = (-20, -15),
skip_first_screenshot: bool = True, skip_first_screenshot: bool = True,
interval: int = 2 interval: int = 1.5
) -> bool: ) -> bool:
# insight index, if failed, return False
if insight and not self.insight_index(index, main, skip_first_screenshot): if insight and not self.insight_index(index, main, skip_first_screenshot):
return False return False
logger.info(f'Select index: {index}') logger.info(f'Select index: {index}')
click_interval = Timer(interval) click_interval = Timer(interval)
load_index_interval = Timer(1) load_index_interval = Timer(1)
timeout = Timer(15, 10).start()
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
else: else:
main.device.screenshot() main.device.screenshot()
if load_index_interval.reached_and_reset(): # load index if not insight
if load_index_interval.reached_and_reset() and not insight:
self.load_stage_indexes(main=main) self.load_stage_indexes(main=main)
# find box of index
index_box = next(filter(lambda x: int(x.ocr_text) == index, self.current_indexes), None) index_box = next(filter(lambda x: int(x.ocr_text) == index, self.current_indexes), None)
if index_box is None: if index_box is None:
logger.warning(f'No index {index} in {self.index_ocr.name}') logger.warning(f'No index {index} in {self.index_ocr.name}')
return False continue
stage_item_box = area_pad((*offset, *area_size(self.stage_item))) stage_item_box = area_pad((*offset, *area_size(self.stage_item)))
search_box = area_offset(stage_item_box, index_box.box[:2]) search_box = area_offset(stage_item_box, index_box.box[:2])
@ -188,7 +192,7 @@ class StageList:
if not points: if not points:
logger.warning(f'No clickable {self.enter.name}') logger.warning(f'No clickable {self.enter.name}')
return False continue
point = area_offset((0, 0, *area_size(self.enter.button)), points[0]) point = area_offset((0, 0, *area_size(self.enter.button)), points[0])
click_button = ClickButton(area_offset(point, search_box[:2]), name=self.enter.name) click_button = ClickButton(area_offset(point, search_box[:2]), name=self.enter.name)
@ -196,3 +200,7 @@ class StageList:
if click_interval.reached_and_reset(): if click_interval.reached_and_reset():
main.device.click(click_button) main.device.click(click_button)
return True return True
if timeout.reached():
logger.warning(f'{self.enter.name} failed')
return False