mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-04-23 14:12:32 +08:00
Opt: Reset dock sorting after changing flagship (#3532)
This commit is contained in:
@@ -194,17 +194,19 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
|
|||||||
scanner.disable('rarity')
|
scanner.disable('rarity')
|
||||||
|
|
||||||
if self.config.GemsFarming_CommonCV == 'any':
|
if self.config.GemsFarming_CommonCV == 'any':
|
||||||
logger.info('')
|
|
||||||
|
|
||||||
self.dock_sort_method_dsc_set(False)
|
self.dock_sort_method_dsc_set(False)
|
||||||
|
|
||||||
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
|
||||||
|
self.dock_sort_method_dsc_set()
|
||||||
return ships
|
return ships
|
||||||
|
|
||||||
scanner.set_limitation(fleet=0)
|
scanner.set_limitation(fleet=0)
|
||||||
return scanner.scan(self.device.image, output=False)
|
ships = scanner.scan(self.device.image, output=False)
|
||||||
|
self.dock_sort_method_dsc_set()
|
||||||
|
return ships
|
||||||
|
|
||||||
else:
|
else:
|
||||||
template = {
|
template = {
|
||||||
@@ -234,6 +236,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
|
|||||||
candidates = [ship for ship in scanner.scan(self.device.image)
|
candidates = [ship for ship in scanner.scan(self.device.image)
|
||||||
if template.match(self.image_crop(ship.button), similarity=SIM_VALUE)]
|
if template.match(self.image_crop(ship.button), similarity=SIM_VALUE)]
|
||||||
|
|
||||||
|
self.dock_sort_method_dsc_set()
|
||||||
return candidates
|
return candidates
|
||||||
|
|
||||||
def get_common_rarity_dd(self):
|
def get_common_rarity_dd(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user