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

Fix: Refocus current fleet in OpsiAbyssal, trying to fix #2069

Browse Source
This commit is contained in:
LmeSzinc
2023-01-11 20:50:30 +08:00
parent 7a7c66c714
commit c39e308a1e
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
module/os/fleet.py
View File

@@ -42,6 +42,9 @@ class BossFleet:
__repr__ = __str__
def __eq__(self, other):
return str(self) == str(other)
class PercentageOcr(Ocr):
def __init__(self, *args, **kwargs):
@@ -646,6 +649,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
Args:
has_fleet_step (bool):
is_month (bool)
Returns:
bool: If success to clear.
@@ -669,7 +673,20 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
continue
# Switch fleet
self.fleet_set(fleet.fleet_index)
if self.fleet_set(fleet.fleet_index):
pass
else:
# Refocus camera if fleet not
others = [f for f in fleets if isinstance(f, BossFleet) and f != fleet]
if len(others):
other: BossFleet = others[0]
self.fleet_set(other.fleet_index)
self.fleet_set(fleet.fleet_index)
else:
logger.warning(f'No other fleets from {fleets}, skip refocus')
pass
# Check fleet
self.handle_os_map_fleet_lock(enable=False)
if self.fleet_low_resolve_appear():
logger.warning('Skip using current fleet because of the low resolve debuff')