sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-27 01:29:23 +08:00
Code Activity

Fix: fleet_selector.get() might return 0

Browse Source
This commit is contained in:
LmeSzinc
2025-12-09 12:28:43 +08:00
parent 1b3d690176
commit b4ba9e5fd0
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/os/fleet.py
View File

@@ -411,7 +411,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
else: else:
if stuck_timer.reached(): if stuck_timer.reached():
logger.warning(f"homo_loca stuck at current view, try reset.") logger.warning(f"homo_loca stuck at current view, try reset.")
self.fleet_reset_view() if self.fleet_reset_view():
stuck_timer.reset() stuck_timer.reset()
confirm_timer.reset() confirm_timer.reset()
record = current record = current
@@ -425,9 +425,17 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
return result return result
def fleet_reset_view(self): def fleet_reset_view(self):
"""
Returns:
bool: If reset
"""
current_fleet = self.fleet_selector.get() current_fleet = self.fleet_selector.get()
if not current_fleet:
logger.warning('Failed to get OpSi fleet')
return False
self.fleet_selector.open() self.fleet_selector.open()
self.fleet_selector.click(current_fleet) self.fleet_selector.click(current_fleet)
return True
def port_goto(self, allow_port_arrive=True): def port_goto(self, allow_port_arrive=True):
""" """
@@ -595,7 +603,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
fleets = self.view.select(is_current_fleet=True) fleets = self.view.select(is_current_fleet=True)
if fleets.count == 0: if fleets.count == 0:
logger.warning('Current fleet not found on local view, reset camera view to current fleet.') logger.warning('Current fleet not found on local view, reset camera view to current fleet.')
self.fleet_reset_view() if self.fleet_reset_view():
self.wait_until_camera_stable() self.wait_until_camera_stable()
continue continue
# Calculate destination # Calculate destination