mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-18 04:31:30 +08:00
Fix: Edge detection in OpSi obscure and abyssal
- Fix: Increase threshold of OCR_SHOP_YELLOW_COINS - Fix: Akashi's shop has been checked twice
This commit is contained in:
@@ -276,6 +276,8 @@ class OSMap(OSFleet, Map, GlobeCamera):
|
||||
# Record current zone, skip this if no rewards from auto search.
|
||||
drop.add(self.device.image)
|
||||
|
||||
self._solved_map_event = set()
|
||||
self._solved_fleet_mechanism = False
|
||||
self.clear_question(drop)
|
||||
if rescan:
|
||||
self.map_rescan(drop)
|
||||
@@ -395,8 +397,6 @@ class OSMap(OSFleet, Map, GlobeCamera):
|
||||
logger.info('Current zone is a port, do not need rescan')
|
||||
return False
|
||||
|
||||
self._solved_map_event = set()
|
||||
self._solved_fleet_mechanism = False
|
||||
for _ in range(5):
|
||||
if not self._solved_fleet_mechanism:
|
||||
self.fleet_set(self.config.OpsiFleet_Fleet)
|
||||
|
||||
@@ -285,6 +285,10 @@ class OperationSiren(OSGlobe):
|
||||
self.config.task_delay(minute=150, server_update=True)
|
||||
self.config.task_stop()
|
||||
|
||||
self.config.override(
|
||||
OpsiGeneral_DoRandomMapEvent=False,
|
||||
HOMO_EDGE_DETECT=False,
|
||||
)
|
||||
self.zone_init()
|
||||
self.fleet_set(self.config.OpsiFleet_Fleet)
|
||||
self.os_order_execute(
|
||||
@@ -326,6 +330,11 @@ class OperationSiren(OSGlobe):
|
||||
self.config.task_delay(minute=150, server_update=True)
|
||||
self.config.task_stop()
|
||||
|
||||
self.config.override(
|
||||
OpsiGeneral_RepairThreshold=0,
|
||||
OpsiGeneral_DoRandomMapEvent=False,
|
||||
HOMO_EDGE_DETECT=False,
|
||||
)
|
||||
self.zone_init()
|
||||
result = self.run_abyssal()
|
||||
if not result:
|
||||
|
||||
Reference in New Issue
Block a user