mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 09:48:20 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -6,7 +6,7 @@ from module.base.decorator import run_once
|
||||
from module.base.timer import Timer
|
||||
from module.campaign.campaign_event import CampaignEvent
|
||||
from module.combat.assets import *
|
||||
from module.exception import ScriptError
|
||||
from module.exception import OilExhausted, ScriptError
|
||||
from module.logger import logger
|
||||
from module.map.map_operation import MapOperation
|
||||
from module.ocr.ocr import Digit, DigitCounter
|
||||
@@ -16,10 +16,6 @@ from module.ui.assets import RAID_CHECK
|
||||
from module.ui.page import page_rpg_stage
|
||||
|
||||
|
||||
class OilExhausted(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class RaidCounter(DigitCounter):
|
||||
def pre_process(self, image):
|
||||
image = super().pre_process(image)
|
||||
@@ -194,7 +190,7 @@ def pt_ocr(raid):
|
||||
|
||||
|
||||
class Raid(MapOperation, RaidCombat, CampaignEvent):
|
||||
def combat_preparation(self, balance_hp=False, emotion_reduce=False, auto=True, fleet_index=1):
|
||||
def combat_preparation(self, balance_hp=False, emotion_reduce=False, auto='combat_auto', fleet_index=1):
|
||||
"""
|
||||
Args:
|
||||
balance_hp (bool):
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
from module.base.timer import Timer
|
||||
from module.campaign.campaign_event import CampaignEvent
|
||||
from module.exception import ScriptEnd, ScriptError
|
||||
from module.exception import OilExhausted, ScriptEnd, ScriptError
|
||||
from module.logger import logger
|
||||
from module.raid.assets import RAID_REWARDS
|
||||
from module.raid.raid import OilExhausted, Raid, raid_ocr
|
||||
from module.raid.raid import Raid, raid_ocr
|
||||
from module.ui.page import page_raid, page_rpg_stage
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user