sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
sui-feng-cb
2024-12-10 12:01:21 +08:00
parent fbd3c23ea7 80817640d8
commit 77774b6e93
34 changed files with 203 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/os/fleet.py
View File

@@ -369,7 +369,8 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
# Arrive
# Check colors, because screen goes black when something is unlocking.
if self.is_in_map() and IN_MAP.match_appear_on(self.device.image):
# A direct use of IN_MAP, basically `self.is_in_map() and IN_MAP.match_template_color()`
if self.match_template_color(IN_MAP, offset=(200, 5)):
self.update_os()
current = self.view.backend.homo_loca
logger.attr('homo_loca', current)

2
module/os/map_fleet_selector.py
View File

@@ -29,7 +29,7 @@ class FleetSelector:
int: Index of current fleet, 1 to 4. return 0 if unrecognized.
"""
for index, button in enumerate([FLEET_1, FLEET_2, FLEET_3, FLEET_4]):
if self.main.appear(button, offset=(20, 20), threshold=0.75):
if self.main.appear(button, offset=(20, 20), similarity=0.75):
return index + 1
logger.info('Unknown OpSi fleet')