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

Fix: Change equipment for the first fleet if multiple daily fleets are set (#324)

Browse Source
This commit is contained in:
LmeSzinc
2021-01-30 10:34:05 +08:00
parent 26c484bd87
commit bae2ee8a64
1 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/equipment/fleet_equipment.py
View File

@@ -1,5 +1,6 @@
from module.equipment.assets import * from module.equipment.assets import *
from module.equipment.equipment import Equipment from module.equipment.equipment import Equipment
from module.logger import logger
from module.ocr.ocr import Digit from module.ocr.ocr import Digit
from module.ui.assets import FLEET_CHECK from module.ui.assets import FLEET_CHECK
from module.ui.ui import page_fleet from module.ui.ui import page_fleet
@@ -10,6 +11,15 @@ OCR_FLEET_INDEX = Digit(OCR_FLEET_INDEX, letter=(90, 154, 255), threshold=128, a
class DailyEquipment(Equipment): class DailyEquipment(Equipment):
equipment_has_take_on = False equipment_has_take_on = False
@property
def _fleet_daily(self):
fleet = self.config.FLEET_DAILY
if isinstance(fleet, list):
logger.info(f'Multiple daily fleets are set, change equipment only for the first one. fleet: {fleet}')
return fleet[0]
else:
return fleet
def equipment_take_on(self): def equipment_take_on(self):
if self.config.FLEET_DAILY_EQUIPMENT is None: if self.config.FLEET_DAILY_EQUIPMENT is None:
return False return False
@@ -17,7 +27,7 @@ class DailyEquipment(Equipment):
return False return False
self.ui_ensure(page_fleet) self.ui_ensure(page_fleet)
self.ui_ensure_index(self.config.FLEET_DAILY, letter=OCR_FLEET_INDEX, next_button=FLEET_NEXT, prev_button=FLEET_PREV) self.ui_ensure_index(self._fleet_daily, letter=OCR_FLEET_INDEX, next_button=FLEET_NEXT, prev_button=FLEET_PREV)
super().equipment_take_on(enter=FLEET_ENTER, out=FLEET_CHECK, fleet=self.config.FLEET_DAILY_EQUIPMENT) super().equipment_take_on(enter=FLEET_ENTER, out=FLEET_CHECK, fleet=self.config.FLEET_DAILY_EQUIPMENT)
self.equipment_has_take_on = True self.equipment_has_take_on = True
self.device.sleep(1) self.device.sleep(1)
@@ -30,7 +40,7 @@ class DailyEquipment(Equipment):
return False return False
self.ui_ensure(page_fleet) self.ui_ensure(page_fleet)
self.ui_ensure_index(self.config.FLEET_DAILY, letter=OCR_FLEET_INDEX, next_button=FLEET_NEXT, prev_button=FLEET_PREV) self.ui_ensure_index(self._fleet_daily, letter=OCR_FLEET_INDEX, next_button=FLEET_NEXT, prev_button=FLEET_PREV)
super().equipment_take_off(enter=FLEET_ENTER, out=FLEET_CHECK, fleet=self.config.FLEET_DAILY_EQUIPMENT) super().equipment_take_off(enter=FLEET_ENTER, out=FLEET_CHECK, fleet=self.config.FLEET_DAILY_EQUIPMENT)
self.equipment_has_take_on = False self.equipment_has_take_on = False
self.device.sleep(1) self.device.sleep(1)