Răsfoiți Sursa

fix: RuleAnimate uses full screenshot as template causing false animation-stable and invalid template (265,0,3)

m123711 2 luni în urmă
părinte
comite
c9f17c9a7b
2 a modificat fișierele cu 7 adăugiri și 1 ștergeri
  1. 1 1
      module/atom/animate.py
  2. 6 0
      module/atom/image.py

+ 1 - 1
module/atom/animate.py

@@ -55,7 +55,7 @@ class RuleAnimate(RuleImage):
         @return:
         """
         if self._last_image is None:
-            self._last_image = image
+            self._last_image = self.corp(image, self.roi_front)
             return False
 
         self._image = self._last_image

+ 6 - 0
module/atom/image.py

@@ -157,6 +157,9 @@ class RuleImage(RuleImageMallResourceMixin):
         if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
             logger.error(f"Template image is invalid: {mat.shape}")
             return False  # 模板无效,匹配失败
+        if mat.shape[0] > source.shape[0] or mat.shape[1] > source.shape[1]:
+            # 模板大于源图,视为无效匹配(避免 matchTemplate 的异常行为)
+            return False
 
         res = cv2.matchTemplate(source, mat, cv2.TM_CCOEFF_NORMED)
         min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)  # 最小匹配度,最大匹配度,最小匹配度的坐标,最大匹配度的坐标
@@ -200,6 +203,9 @@ class RuleImage(RuleImageMallResourceMixin):
         if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
             logger.error(f"Template image is invalid: {mat.shape}")
             return False
+        if mat.shape[0] > source.shape[0] or mat.shape[1] > source.shape[1]:
+            # 模板大于源图,视为无效匹配(避免 matchTemplate 的异常行为)
+            return False
 
         # 预计算模板尺寸
         mat_h, mat_w = mat.shape[:2]