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

Chore: Abstract OilExhausted as global internal exception

Browse Source
This commit is contained in:
LmeSzinc
2025-03-28 02:10:52 +08:00
parent 02b84dfb02
commit d0d6dc8b54
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/event_hospital/clue.py
View File

@@ -4,7 +4,7 @@ from typing import List, Optional, Tuple
import cv2 import cv2
import numpy as np import numpy as np
from module.base.utils import area_offset, color_similarity_2d, rgb2gray, xywh2xyxy, area_pad, image_size from module.base.utils import area_offset, color_similarity_2d, image_size, rgb2gray, xywh2xyxy
from module.event_hospital.assets import * from module.event_hospital.assets import *
from module.event_hospital.ui import HospitalUI from module.event_hospital.ui import HospitalUI
from module.logger import logger from module.logger import logger

3
module/event_hospital/combat.py
View File

@@ -4,11 +4,10 @@ from module.campaign.campaign_event import CampaignEvent
from module.combat.combat import BATTLE_PREPARATION, Combat from module.combat.combat import BATTLE_PREPARATION, Combat
from module.event_hospital.assets import HOSPITAL_BATTLE_PREPARE from module.event_hospital.assets import HOSPITAL_BATTLE_PREPARE
from module.event_hospital.ui import HospitalUI from module.event_hospital.ui import HospitalUI
from module.exception import RequestHumanTakeover from module.exception import OilExhausted, RequestHumanTakeover
from module.logger import logger from module.logger import logger
from module.map.assets import * from module.map.assets import *
from module.map.map_fleet_preparation import FleetOperator from module.map.map_fleet_preparation import FleetOperator
from module.raid.raid import OilExhausted
class HospitalCombat(Combat, HospitalUI, CampaignEvent): class HospitalCombat(Combat, HospitalUI, CampaignEvent):

3
module/event_hospital/hospital.py
View File

@@ -2,9 +2,8 @@ from module.config.config import TaskEnd
from module.event_hospital.assets import * from module.event_hospital.assets import *
from module.event_hospital.clue import HospitalClue from module.event_hospital.clue import HospitalClue
from module.event_hospital.combat import HospitalCombat from module.event_hospital.combat import HospitalCombat
from module.exception import ScriptEnd from module.exception import OilExhausted, ScriptEnd
from module.logger import logger from module.logger import logger
from module.raid.raid import OilExhausted
from module.ui.page import page_hospital from module.ui.page import page_hospital

4
module/exception.py
View File

@@ -2,6 +2,10 @@ class CampaignEnd(Exception):
pass pass
class OilExhausted(Exception):
pass
class MapDetectionError(Exception): class MapDetectionError(Exception):
pass pass

6
module/raid/raid.py
View File

@@ -6,7 +6,7 @@ from module.base.decorator import run_once
from module.base.timer import Timer from module.base.timer import Timer
from module.campaign.campaign_event import CampaignEvent from module.campaign.campaign_event import CampaignEvent
from module.combat.assets import * from module.combat.assets import *
from module.exception import ScriptError from module.exception import OilExhausted, ScriptError
from module.logger import logger from module.logger import logger
from module.map.map_operation import MapOperation from module.map.map_operation import MapOperation
from module.ocr.ocr import Digit, DigitCounter 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 from module.ui.page import page_rpg_stage
class OilExhausted(Exception):
pass
class RaidCounter(DigitCounter): class RaidCounter(DigitCounter):
def pre_process(self, image): def pre_process(self, image):
image = super().pre_process(image) image = super().pre_process(image)

4
module/raid/run.py
View File

@@ -1,9 +1,9 @@
from module.base.timer import Timer from module.base.timer import Timer
from module.campaign.campaign_event import CampaignEvent 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.logger import logger
from module.raid.assets import RAID_REWARDS 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 from module.ui.page import page_raid, page_rpg_stage