提高角色识别精度

Author: ok-oldking

src/char/BaseChar.py

@@ -39,7 +39,7 @@ class Role(StrEnum):
 class BaseChar:
     """角色基类，定义了游戏角色的通用属性和行为。"""
 
-    def __init__(self, task, index, res_cd=20, echo_cd=20, liberation_cd=25, char_name=None):
+    def __init__(self, task, index, res_cd=20, echo_cd=20, liberation_cd=25, char_name=None, confidence=1):
         """初始化角色基础属性。
 
         Args:
@@ -68,13 +68,14 @@ def __init__(self, task, index, res_cd=20, echo_cd=20, liberation_cd=25, char_na
         self._liberation_available = False
         self._resonance_available = False
         self._echo_available = False
-        self.logger = Logger.get_logger(self.name)
         self.full_ring_area = 0
         self.last_perform = 0
         self.current_con = 0
         self.has_tool_box = False
         self.intro_motion_freeze_duration = 0.9
         self.last_outro_time = -1
+        self.confidence = confidence
+        self.logger = Logger.get_logger(self.name)
 
     def skip_combat_check(self):
         """是否在某些操作中跳过战斗状态检查。
@@ -97,7 +98,7 @@ def name(self):
         Returns:
             str: 角色类名字符串。
         """
-        return self.__class__.__name__
+        return f"{self.__class__.__name__}"
 
     def __eq__(self, other):
         """比较两个角色对象是否相同 (基于名称和索引)。"""
@@ -783,9 +784,9 @@ def check_outro(self):
                 time = char.last_switch_time
                 outro = char.char_name
         self.logger.info(f'erned outro from {outro}')
-        return outro 
-        
-    # def count_rectangle_forte(self, left=0.42, right=0.57):
+        return outro
+
+        # def count_rectangle_forte(self, left=0.42, right=0.57):
     # """计算矩形共鸣回路充能格数 (已注释)。"""
     #     # Perform image cropping once, as it's independent of saturation ranges
     #     cropped_image_base = self.task.box_of_screen(left, 0.927, right, 0.931).crop_frame(self.task.frame)

src/char/CharFactory.py

@@ -72,18 +72,18 @@ def get_char_by_pos(task, box, index, old_char):
     name = "unknown"
     char = None
     if old_char and old_char.char_name in char_names:
-        char = task.find_one(old_char.char_name, box=box, threshold=0.6)
+        char = task.find_one(old_char.char_name, box=box, threshold=0.8)
         if char:
             return old_char
 
     if not char:
-        char = task.find_best_match_in_box(box, char_names, threshold=0.6)
+        char = task.find_best_match_in_box(box, char_names, threshold=0.8)
         if char:
             info = char_dict.get(char.name)
             name = char.name
             cls = info.get('cls')
             return cls(task, index, info.get('res_cd'), info.get('echo_cd'), info.get('liberation_cd') or 25,
-                       char_name=name)
+                       char_name=name, confidence=char.confidence)
     task.log_info(f'could not find char {index} {info} {highest_confidence}')
     if old_char:
         return old_char

src/task/BaseCombatTask.py

@@ -513,7 +513,7 @@ def load_chars(self):
                     char.is_current_char = False
         self.combat_start = time.time()
 
-        # self.log_info(f'load chars success {self.chars}')
+        # self.log_info(f'load chars success {self.chars} {[obj.confidence for obj in self.chars]}')
 
     @staticmethod
     def should_update(the_char, old_char):