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

Merge branch 'dev' into dockScanner

Browse Source
This commit is contained in:
Horizon101011
2022-10-25 18:42:25 +08:00
committed by GitHub
parent 0c5c0f6dbc f32d275fec
commit 34e21beb1f
129 changed files with 1633 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/campaign/gems_farming.py
View File

@@ -6,10 +6,13 @@ from module.equipment.fleet_equipment import OCR_FLEET_INDEX
from module.exception import CampaignEnd
from module.logger import logger
from module.map.assets import FLEET_PREPARATION, MAP_PREPARATION
from module.combat.assets import BATTLE_PREPARATION
from module.ocr.ocr import Digit
from module.retire.assets import DOCK_CHECK, TEMPLATE_BOGUE, TEMPLATE_HERMES, TEMPLATE_LANGLEY, TEMPLATE_RANGER
from module.retire.dock import Dock
from module.retire.scanner import ShipScanner
from module.ui.page import page_fleet
from module.ui.ui import BACK_ARROW
SIM_VALUE = 0.95
@@ -33,6 +36,9 @@ class GemsCampaignOverride(CampaignBase):
if self.handle_popup_cancel('IGNORE_LOW_EMOTION'):
continue
if self.appear(BATTLE_PREPARATION, offset=(20, 20), interval=2):
self.device.click(BACK_ARROW)
if self.is_in_map():
self.withdraw()
@@ -307,7 +313,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
if self._trigger_lv32 or self._trigger_emotion:
success = self.flagship_change()
if self.config.GemsFarming_LowEmotionRetreat:
if self.config.GemsFarming_LowEmotionRetreat and self.config.GemsFarming_VanguardChange:
success = success and self.vanguard_change()
if is_limit and self.config.StopCondition_RunCount <= 0: