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

Opt: flagship_change logic when use ALLowHighFlagshipLevel

Browse Source
This commit is contained in:
sui-feng-cb
2025-07-10 07:15:56 +08:00
parent 76b40b351c
commit 9a4f3891ed
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/campaign/gems_farming.py
View File

@@ -336,11 +336,12 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
max_level = lv max_level = lv
min_level = 1 min_level = 1
emotion_lower_bound = 0 if emotion == 0 else self.emotion_lower_bound emotion_lower_bound = 0 if emotion == 0 else self.emotion_lower_bound
fleet = [0, self.fleet_to_attack] if self.config.GemsFarming_ALLowHighFlagshipLevel else self.fleet_to_attack
scanner = ShipScanner( scanner = ShipScanner(
level=(min_level, max_level), emotion=(emotion_lower_bound, 150), fleet=self.fleet_to_attack, status='free') level=(min_level, max_level), emotion=(emotion_lower_bound, 150), fleet=fleet, status='free')
scanner.disable('rarity') scanner.disable('rarity')
if self.config.GemsFarming_CommonCV in ['custom', 'any', 'eagle']: if not self.config.GemsFarming_ALLowHighFlagshipLevel:
ships = scanner.scan(self.device.image) ships = scanner.scan(self.device.image)
if ships: if ships:
# Don't need to change current # Don't need to change current
@@ -349,6 +350,7 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
# Change to any ship # Change to any ship
scanner.set_limitation(fleet=0) scanner.set_limitation(fleet=0)
if self.config.GemsFarming_CommonCV in ['custom', 'any', 'eagle']:
candidates = self.find_custom_candidates(scanner, ship_type='cv') candidates = self.find_custom_candidates(scanner, ship_type='cv')
if candidates: if candidates:
@@ -360,12 +362,6 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
else: else:
template = TEMPLATE_COMMON_CV[f'{self.config.GemsFarming_CommonCV.upper()}'] template = TEMPLATE_COMMON_CV[f'{self.config.GemsFarming_CommonCV.upper()}']
ships = scanner.scan(self.device.image)
if ships:
# Don't need to change current
return ships
scanner.set_limitation(fleet=0)
candidates = [ship for ship in scanner.scan(self.device.image, output=False) candidates = [ship for ship in scanner.scan(self.device.image, output=False)
if template.match(self.image_crop(ship.button, copy=False), similarity=SIM_VALUE)] if template.match(self.image_crop(ship.button, copy=False), similarity=SIM_VALUE)]