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

refactor(sweep): separate sweepable check and search_box generate

Browse Source
This commit is contained in:
YoursFunny 2023-11-29 14:11:51 +08:00
parent a0d3fd75af
commit 6ae785634c
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasks/stage/list.py
View File

@ -131,13 +131,25 @@ class StageList:
timeout=Timer(1.5, 5) timeout=Timer(1.5, 5)
) )
def is_sweepable(self, main: ModuleBase, search_box) -> bool:
self.sweepable.load_search(search_box)
return main.appear(self.sweepable)
def search_box(
self,
index_cord: tuple[int, int],
padding: tuple[int, int] = (-20, -15)
) -> tuple[int, int, int, int]:
stage_item_box = area_pad((*padding, *area_size(self.stage_item)))
return area_offset(stage_item_box, index_cord)
def select_index_enter( def select_index_enter(
self, self,
main: ModuleBase, main: ModuleBase,
index: int, index: int,
insight: bool = True, insight: bool = True,
sweepable: bool = True, sweepable: bool = True,
offset: tuple[int, int] = (-20, -15), padding: tuple[int, int] = (-20, -15),
skip_first_screenshot: bool = True, skip_first_screenshot: bool = True,
interval: int = 1.5 interval: int = 1.5
) -> bool: ) -> bool:
@ -165,11 +177,8 @@ class StageList:
logger.warning(f'No index {index} in {self.index_ocr.name}') logger.warning(f'No index {index} in {self.index_ocr.name}')
continue continue
stage_item_box = area_pad((*offset, *area_size(self.stage_item))) search_box = self.search_box(index_box[-1][:2], padding)
search_box = area_offset(stage_item_box, index_box.box[:2]) if sweepable and not self.is_sweepable(main, search_box):
self.sweepable.load_search(search_box)
if sweepable and not main.appear(self.sweepable):
logger.warning(f'Index {index} is not sweepable') logger.warning(f'Index {index} is not sweepable')
return False return False