sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Upd: os_hazard1_leveling task call

Browse Source
This commit is contained in:
sui-feng-cb 2025-03-05 13:55:33 +08:00
parent d94e3f3cdc
commit f53e1a2a11
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/campaign/gems_farming.py
View File

@ -462,31 +462,26 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
fleet=self.fleet_to_attack, status='free') fleet=self.fleet_to_attack, status='free')
scanner.disable('rarity') scanner.disable('rarity')
ships = scanner.scan(self.device.image) current_ship = scanner.scan(self.device.image)
if ships:
# Don't need to change current
if self.config.GemsFarming_CommonDD != 'z20_or_z21' or \
ships[0].emotion not in [24, 44, 54, 64, 84]:
return ships
scanner.set_limitation(fleet=0) scanner.set_limitation(fleet=0)
if self.config.GemsFarming_CommonDD in ['any', 'favourite', 'z20_or_z21', 'DDG']: if self.config.GemsFarming_CommonDD in ['any', 'favourite', 'z20_or_z21', 'DDG']:
# Change to any ship # Change to any ship
return scanner.scan(self.device.image, output=False) return current_ship + scanner.scan(self.device.image, output=False)
candidates = self.find_candidates(self.get_templates(self.config.GemsFarming_CommonDD), scanner) candidates = self.find_candidates(self.get_templates(self.config.GemsFarming_CommonDD), scanner)
if candidates: if candidates:
# Change to specific ship # Change to specific ship
return candidates return current_ship + candidates
logger.info('No specific DD was found, try reversed order.') logger.info('No specific DD was found, try reversed order.')
self.dock_sort_method_dsc_set(False) self.dock_sort_method_dsc_set(False)
# Change specific ship # Change specific ship
candidates = self.find_candidates(self.get_templates(self.config.GemsFarming_CommonDD), scanner) candidates = self.find_candidates(self.get_templates(self.config.GemsFarming_CommonDD), scanner)
return candidates return current_ship + candidates
def find_candidates(self, template, scanner): def find_candidates(self, template, scanner):
""" """

3
module/os/operation_siren.py
View File

@ -441,6 +441,9 @@ class OperationSiren(OSMap):
with self.config.multi_set(): with self.config.multi_set():
self.config.task_delay(server_update=True) self.config.task_delay(server_update=True)
if not self.is_in_opsi_explore(): if not self.is_in_opsi_explore():
self.config.task_call('OpsiAbyssal', force_call=False)
self.config.task_call('OpsiStronghold', force_call=False)
self.config.task_call('OpsiObscure', force_call=False)
self.config.task_call('OpsiMeowfficerFarming') self.config.task_call('OpsiMeowfficerFarming')
self.config.task_stop() self.config.task_stop()