diff --git a/src/char/BaseChar.py b/src/char/BaseChar.py index fb484358..b54bcb60 100644 --- a/src/char/BaseChar.py +++ b/src/char/BaseChar.py @@ -1,8 +1,7 @@ import time from enum import IntEnum, StrEnum -from ok import get_logger -from ok.config.Config import Config +from ok import Config, Logger from src import text_white_color from typing import Any @@ -45,7 +44,7 @@ def __init__(self, task, index, res_cd=20, echo_cd=20): self.res_cd = res_cd self.is_current_char = False self.liberation_available_mark = False - self.logger = get_logger(self.name) + self.logger = Logger.get_logger(self.name) self.full_ring_area = 0 self.freeze_durations = [] self.last_perform = 0 diff --git a/src/char/CharSkillButton.py b/src/char/CharSkillButton.py index 0acc8394..9807a6bd 100644 --- a/src/char/CharSkillButton.py +++ b/src/char/CharSkillButton.py @@ -2,9 +2,9 @@ import cv2 -from ok import get_logger +from ok import Logger -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class CharSkillButton: diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py index 26dca5b5..54dd3eeb 100644 --- a/src/combat/CombatCheck.py +++ b/src/combat/CombatCheck.py @@ -1,13 +1,12 @@ import time import re -from ok import find_boxes_by_name +from ok import find_boxes_by_name, Logger from ok import find_color_rectangles, get_mask_in_color_range, is_pure_black -from ok import get_logger from src import text_white_color from src.task.BaseWWTask import BaseWWTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class CombatCheck(BaseWWTask): diff --git a/src/task/AutoCombatTask.py b/src/task/AutoCombatTask.py index 77c3609f..89fdfdc2 100644 --- a/src/task/AutoCombatTask.py +++ b/src/task/AutoCombatTask.py @@ -1,10 +1,9 @@ from qfluentwidgets import FluentIcon -from ok import TriggerTask -from ok import get_logger +from ok import TriggerTask, Logger from src.task.BaseCombatTask import BaseCombatTask, NotInCombatException, CharDeadException -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class AutoCombatTask(BaseCombatTask, TriggerTask): diff --git a/src/task/AutoLoginTask.py b/src/task/AutoLoginTask.py index fc0d0ab9..e39d39eb 100644 --- a/src/task/AutoLoginTask.py +++ b/src/task/AutoLoginTask.py @@ -1,10 +1,9 @@ from qfluentwidgets import FluentIcon -from ok import TriggerTask -from ok import get_logger +from ok import TriggerTask, Logger from src.task.BaseWWTask import BaseWWTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class AutoLoginTask(BaseWWTask, TriggerTask): diff --git a/src/task/AutoPickTask.py b/src/task/AutoPickTask.py index f92894d3..6ee7b7c4 100644 --- a/src/task/AutoPickTask.py +++ b/src/task/AutoPickTask.py @@ -1,11 +1,10 @@ from qfluentwidgets import FluentIcon -from ok import FindFeature +from ok import FindFeature, Logger from ok import TriggerTask -from ok import get_logger from src.task.BaseWWTask import BaseWWTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class AutoPickTask(TriggerTask, BaseWWTask, FindFeature): diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 1200571f..a66c757c 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -4,10 +4,9 @@ import numpy as np import re +from ok import ConfigOption, Logger from ok import get_connected_area_by_color, color_range_to_bound -from ok import get_logger from ok import safe_get -from ok.config.ConfigOption import ConfigOption from src import text_white_color from src.char import BaseChar from src.char.BaseChar import Priority, dot_color @@ -15,7 +14,7 @@ from src.char.Healer import Healer from src.combat.CombatCheck import CombatCheck -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class NotInCombatException(Exception): diff --git a/src/task/BaseWWTask.py b/src/task/BaseWWTask.py index 0c8ab405..e1e316a7 100644 --- a/src/task/BaseWWTask.py +++ b/src/task/BaseWWTask.py @@ -2,12 +2,11 @@ import re from datetime import datetime, timedelta -from ok import BaseTask +from ok import BaseTask, Logger from ok import CannotFindException -from ok import get_logger -from ok.config.ConfigOption import ConfigOption +from ok import ConfigOption -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) pick_echo_config_option = ConfigOption('Pick Echo Config', { 'Use OCR': False diff --git a/src/task/DiagnosisTask.py b/src/task/DiagnosisTask.py index 1220510b..44a9d19a 100644 --- a/src/task/DiagnosisTask.py +++ b/src/task/DiagnosisTask.py @@ -1,9 +1,9 @@ import time -from ok import get_logger +from ok import Logger from src.task.BaseCombatTask import BaseCombatTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class DiagnosisTask(BaseCombatTask): diff --git a/src/task/DiscardEchoTask.py b/src/task/DiscardEchoTask.py index 4ada5dd8..746a3b80 100644 --- a/src/task/DiscardEchoTask.py +++ b/src/task/DiscardEchoTask.py @@ -1,7 +1,7 @@ -from ok import find_index_in_list +from ok import Feature -from ok.feature.Feature import Feature -from ok.feature.FeatureSet import mask_white +from ok import find_index_in_list +from ok import mask_white from src.task.BaseCombatTask import BaseCombatTask diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py index 48eeda3b..efb7bc8e 100644 --- a/src/task/FarmEchoTask.py +++ b/src/task/FarmEchoTask.py @@ -1,9 +1,9 @@ from qfluentwidgets import FluentIcon -from ok import get_logger +from ok import Logger from src.task.BaseCombatTask import BaseCombatTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class FarmEchoTask(BaseCombatTask): diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index d2dca106..15fb5d73 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -1,9 +1,9 @@ from qfluentwidgets import FluentIcon -from ok import get_logger +from ok import Logger from src.task.BaseCombatTask import BaseCombatTask, CharDeadException -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class FarmWorldBossTask(BaseCombatTask): diff --git a/src/task/FarmWorldTask.py b/src/task/FarmWorldTask.py index a205434d..334706a1 100644 --- a/src/task/FarmWorldTask.py +++ b/src/task/FarmWorldTask.py @@ -1,9 +1,9 @@ from qfluentwidgets import FluentIcon -from ok import get_logger +from ok import Logger from src.task.BaseCombatTask import BaseCombatTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class FarmWorldTask(BaseCombatTask): diff --git a/src/task/FiveToOneTask.py b/src/task/FiveToOneTask.py index 3f66f92f..939dd208 100644 --- a/src/task/FiveToOneTask.py +++ b/src/task/FiveToOneTask.py @@ -2,11 +2,10 @@ import numpy as np import re -from ok import find_boxes_by_name, find_boxes_within_boundary -from ok import get_logger +from ok import find_boxes_by_name, find_boxes_within_boundary, Logger from src.task.BaseCombatTask import BaseCombatTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class FiveToOneTask(BaseCombatTask): diff --git a/src/task/MouseResetTask.py b/src/task/MouseResetTask.py index b1877021..925913c3 100644 --- a/src/task/MouseResetTask.py +++ b/src/task/MouseResetTask.py @@ -3,10 +3,9 @@ import win32api from qfluentwidgets import FluentIcon -from ok import TriggerTask -from ok import get_logger +from ok import TriggerTask, Logger -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class MouseResetTask(TriggerTask): diff --git a/src/task/SkipBaseTask.py b/src/task/SkipBaseTask.py index 4a22a240..493df968 100644 --- a/src/task/SkipBaseTask.py +++ b/src/task/SkipBaseTask.py @@ -1,12 +1,11 @@ import time import re -from ok import FindFeature +from ok import FindFeature, Logger from ok import OCR -from ok import get_logger from src.task.BaseWWTask import BaseWWTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class SkipBaseTask(BaseWWTask, FindFeature, OCR): diff --git a/src/task/SkipDialogTask.py b/src/task/SkipDialogTask.py index 3030760d..23f5ec4c 100644 --- a/src/task/SkipDialogTask.py +++ b/src/task/SkipDialogTask.py @@ -1,8 +1,7 @@ -from ok import TriggerTask -from ok import get_logger +from ok import TriggerTask, Logger from src.task.SkipBaseTask import SkipBaseTask -logger = get_logger(__name__) +logger = Logger.get_logger(__name__) class AutoDialogTask(TriggerTask, SkipBaseTask):