sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-11 16:52:30 +08:00
Code Activity

Fix: Use the same similarity in zone select

Browse Source
This commit is contained in:
LmeSzinc
2022-07-05 00:26:00 +08:00
parent e36db6d5c7
commit 4b843ed06b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/os/globe_operation.py
View File

@@ -125,6 +125,7 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
return self.appear(ZONE_SWITCH, offset=(5, 5)) return self.appear(ZONE_SWITCH, offset=(5, 5))
_zone_select_offset = (20, 200) _zone_select_offset = (20, 200)
_zone_select_similarity = 0.75
def get_zone_select(self): def get_zone_select(self):
""" """
@@ -134,7 +135,7 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
# Lower threshold to 0.75 # Lower threshold to 0.75
# Don't know why buy but fonts are different sometimes # Don't know why buy but fonts are different sometimes
return [select for select in ZONE_SELECT if return [select for select in ZONE_SELECT if
self.appear(select, offset=self._zone_select_offset, threshold=0.75)] self.appear(select, offset=self._zone_select_offset, threshold=self._zone_select_similarity)]
def is_in_zone_select(self): def is_in_zone_select(self):
""" """
@@ -178,7 +179,11 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
in: is_in_zone_select in: is_in_zone_select
out: is_zone_pinned out: is_zone_pinned
""" """
self.ui_click(button, check_button=self.is_zone_pinned, offset=self._zone_select_offset,
def appear():
return self.appear(button, offset=self._zone_select_offset, threshold=self._zone_select_similarity)
self.ui_click(button, appear_button=appear, check_button=self.is_zone_pinned,
skip_first_screenshot=True) skip_first_screenshot=True)
def zone_type_select(self, types=('SAFE', 'DANGEROUS')): def zone_type_select(self, types=('SAFE', 'DANGEROUS')):