重构

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 @@ class BaseChar:
         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

src/char/CharSkillButton.py

@@ -2,9 +2,9 @@ import time
 
 import cv2
 
-from ok import get_logger
+from ok import Logger
 
-logger = get_logger(__name__)
+logger = Logger.get_logger(__name__)
 
 
 class CharSkillButton:

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):

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):

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):

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):

src/task/BaseCombatTask.py

@@ -4,10 +4,9 @@ import cv2
 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.CharFactory import get_char_by_pos
 from src.char.Healer import Healer
 from src.combat.CombatCheck import CombatCheck
 
-logger = get_logger(__name__)
+logger = Logger.get_logger(__name__)
 
 
 class NotInCombatException(Exception):

src/task/BaseWWTask.py

@@ -2,12 +2,11 @@ import time
 
 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

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):

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
 
 

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):

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):

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):

src/task/FiveToOneTask.py

@@ -2,11 +2,10 @@ import cv2
 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):

src/task/MouseResetTask.py

@@ -3,10 +3,9 @@ import math
 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):

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):

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):