Просмотр исходного кода

feat: 优化多尺度模板匹配参数

使用方式:
# scale_range: 缩放范围 (start, end, step),step不填默认0.1
self.appear_then_click_multi_scale(self.I_SHI_GROWN, scale_range=(0.8, 1.2))
# scales: 自定义缩放列表
self.appear_then_click_multi_scale(self.I_SHI_GROWN, scales=[0.8, 0.9, 1.0, 1.1])
# 都不指定则使用默认 [0.5, 0.6, ..., 1.2]
self.appear_then_click_multi_scale(self.I_SHI_GROWN)
优先级:scale_range > scales > 默认
yuyuyuyuyu 9 месяцев назад
Родитель
Сommit
0259c868f5
2 измененных файлов с 21 добавлено и 6 удалено
  1. 13 2
      module/atom/image.py
  2. 8 4
      tasks/base_task.py

+ 13 - 2
module/atom/image.py

@@ -170,17 +170,28 @@ class RuleImage(RuleImageMallResourceMixin):
             return False
 
     def match_multi_scale(self, image: np.array, threshold: float = None,
-                          scales: list = None) -> bool:
+                          scales: list = None, scale_range: tuple = None) -> bool:
         """
         多尺度模板匹配,自动尝试多个缩放比例以适应图片大小的变化
         :param image: 原始截图
         :param threshold: 匹配阈值
-        :param scales: 缩放比例列表,默认 [0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2]
+        :param scales: 缩放比例列表
+        :param scale_range: 缩放范围 (start, end, step),例如 (0.8, 1.2, 0.1),step 默认为 0.1
         :return: 匹配是否成功
         """
         if threshold is None:
             threshold = self.threshold
 
+        # 如果指定了 scale_range,自动生成 scales 列表
+        if scale_range is not None:
+            if len(scale_range) == 2:
+                # 只有 start, end,默认 step=0.1
+                start, end = scale_range
+                scales = [round(x * 10) / 10 for x in np.arange(start, end + 0.1, 0.1)]
+            else:
+                start, end, step = scale_range
+                scales = [round(x * 10) / 10 for x in np.arange(start, end + step, step)]
+
         if scales is None:
             scales = [0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2]
 

+ 8 - 4
tasks/base_task.py

@@ -219,13 +219,15 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                            target: RuleImage,
                            interval: float = None,
                            threshold: float = None,
-                           scales: list = None):
+                           scales: list = None,
+                           scale_range: tuple = None):
         """
         多尺度图片识别,自动尝试多个缩放比例以适应图片大小的变化
         :param target: RuleImage对象
         :param interval: 匹配间隔时间
         :param threshold: 匹配阈值
-        :param scales: 缩放比例列表,默认 [0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2]
+        :param scales: 缩放比例列表
+        :param scale_range: 缩放范围 (start, end, step),例如 (0.8, 1.2, 0.1)
         :return: interval时间到达且匹配成功则返回True, 否则False
         """
         if interval:
@@ -237,7 +239,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             if not self.interval_timer[target.name].reached():
                 return False
 
-        appear = target.match_multi_scale(self.device.image, threshold=threshold, scales=scales)
+        appear = target.match_multi_scale(self.device.image, threshold=threshold, scales=scales, scale_range=scale_range)
 
         if appear and interval:
             self.interval_timer[target.name].reset()
@@ -250,6 +252,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                                       interval: float = None,
                                       threshold: float = None,
                                       scales: list = None,
+                                      scale_range: tuple = None,
                                       duration: float = None):
         """
         多尺度图片识别并点击,自动尝试多个缩放比例以适应图片大小的变化
@@ -258,10 +261,11 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         :param interval: 匹配间隔时间
         :param threshold: 匹配阈值
         :param scales: 缩放比例列表
+        :param scale_range: 缩放范围 (start, end, step),例如 (0.8, 1.2, 0.1)
         :param duration: 长按时间(毫秒)
         :return: True or False
         """
-        appear = self.appear_multi_scale(target, interval=interval, threshold=threshold, scales=scales)
+        appear = self.appear_multi_scale(target, interval=interval, threshold=threshold, scales=scales, scale_range=scale_range)
 
         if appear and not action:
             x, y = target.coord()