Merge branch 'main' of https://git.zhaozuohong.vip/mower-ng/mower-ng

mower/solvers/sss/sss_fight.py

@@ -2,6 +2,7 @@ from copy import deepcopy
 from datetime import datetime, timedelta
 
 import cv2
+import numpy as np
 from scipy.signal import argrelmax
 from skimage.metrics import structural_similarity
 
@@ -209,7 +210,11 @@ class SSSFightSolver(SceneGraphSolver):
             pos = self.calc.get_character_screen_pos(x, y, False, False)
             pos = int(pos.x), int(pos.y)
             img = cropimg(config.recog.img, sa(((-15, -168), (20, -128)), pos))
-            result = cv2.matchTemplate(img, skill_ready, cv2.TM_CCORR_NORMED)
+            mask = np.ones_like(skill_ready, dtype=np.float32)
+            mask[8:17, :] = 0
+            result = cv2.matchTemplate(
+                img, skill_ready, cv2.TM_CCOEFF_NORMED, mask=mask
+            )
             min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(result)
             logger.debug(f"{max_val=} {max_loc=}")
             return max_val >= 0.8