Преглед изворни кода

feat(Dokan): 优化绿标检测逻辑

- 调整绿标检测区域和阈值,提高检测准确性
- 增加绿标状态初始化和消失计数逻辑
- 优化点击间隔和战斗流程控制
ChengRanORZ пре 1 година
родитељ
комит
cee6b0d78e

+ 8 - 4
tasks/Component/GeneralBattle/assets.py

@@ -27,13 +27,13 @@ class GeneralBattleAssets:
 
 
 	# Click Rule Assets
 	# Click Rule Assets
 	# 预设队伍1 
 	# 预设队伍1 
-	C_PRESET_TEAM_1 = RuleClick(roi_front=(196,234,464,114), roi_back=(196,234,464,114), name="preset_team_1")
+	C_PRESET_TEAM_1 = RuleClick(roi_front=(195,235,465,110), roi_back=(195,235,465,110), name="preset_team_1")
 	# 预设队伍2 
 	# 预设队伍2 
-	C_PRESET_TEAM_2 = RuleClick(roi_front=(197,358,465,103), roi_back=(197,358,465,103), name="preset_team_2")
+	C_PRESET_TEAM_2 = RuleClick(roi_front=(195,355,465,110), roi_back=(195,355,465,110), name="preset_team_2")
 	# 预设队伍3 
 	# 预设队伍3 
-	C_PRESET_TEAM_3 = RuleClick(roi_front=(195,480,462,100), roi_back=(195,480,462,100), name="preset_team_3")
+	C_PRESET_TEAM_3 = RuleClick(roi_front=(195,475,465,110), roi_back=(195,475,465,110), name="preset_team_3")
 	# 预设队伍4 
 	# 预设队伍4 
-	C_PRESET_TEAM_4 = RuleClick(roi_front=(193,596,464,35), roi_back=(193,596,464,35), name="preset_team_4")
+	C_PRESET_TEAM_4 = RuleClick(roi_front=(195,595,465,35), roi_back=(195,595,465,35), name="preset_team_4")
 	# 预设组1 
 	# 预设组1 
 	C_PRESET_GROUP_1 = RuleClick(roi_front=(35,240,25,50), roi_back=(35,240,25,50), name="preset_group_1")
 	C_PRESET_GROUP_1 = RuleClick(roi_front=(35,240,25,50), roi_back=(35,240,25,50), name="preset_group_1")
 	# 预设组2 
 	# 预设组2 
@@ -117,6 +117,10 @@ class GeneralBattleAssets:
 	I_DE_GOLD = RuleImage(roi_front=(61,52,30,25), roi_back=(45,33,65,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_de_gold.png")
 	I_DE_GOLD = RuleImage(roi_front=(61,52,30,25), roi_back=(45,33,65,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_de_gold.png")
 	# 绿标 
 	# 绿标 
 	I_GREEN_MARKER = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_green_marker.png")
 	I_GREEN_MARKER = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_green_marker.png")
+	# 绿标-左上角部分 
+	I_GREEN_MARKER_LEFT_TOP = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_green_marker_left_top.png")
+	# 绿标-下半部分 
+	I_GREEN_MARKER_BOTTOM = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_green_marker_bottom.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

BIN
tasks/Component/GeneralBattle/gb/gb_green_marker_bottom.png


BIN
tasks/Component/GeneralBattle/gb/gb_green_marker_left_top.png


+ 18 - 0
tasks/Component/GeneralBattle/gb/image.json

@@ -223,5 +223,23 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "绿标"
     "description": "绿标"
+  },
+  {
+    "itemName": "green_marker_left_top",
+    "imageName": "gb_green_marker_left_top.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "绿标-左上角部分"
+  },
+  {
+    "itemName": "green_marker_bottom",
+    "imageName": "gb_green_marker_bottom.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "绿标-下半部分"
   }
   }
 ]
 ]

+ 30 - 8
tasks/Dokan/ex_green_mark.py

@@ -85,7 +85,10 @@ from tasks.Dokan.utils import retry
 class GreenMarkState(int, Enum):
 class GreenMarkState(int, Enum):
     #
     #
     NOT_INIT = 0,
     NOT_INIT = 0,
-    INITED = 1
+    INITED = 1,
+    # 备用
+    MARKED=2,
+    DISAPPEARED = 3
 
 
 
 
 class ExtendGreenMark(GeneralBattle):
 class ExtendGreenMark(GeneralBattle):
@@ -182,8 +185,11 @@ class ExtendGreenMark(GeneralBattle):
         if len(res) <= 0:
         if len(res) <= 0:
             return None
             return None
         box = res[0].box
         box = res[0].box
+        # 经实验,点击式神名称位置,可能点击不到,故此做一个修正
+        offset = [5, 30, -10, 0]
         # x,y,w,h
         # x,y,w,h
-        return [box[0, 0], box[0, 1], box[2, 0] - box[0, 0], box[2, 1] - box[0, 1]]
+        return [box[0, 0] + offset[0], box[0, 1] + offset[1], box[2, 0] - box[0, 0] + offset[2],
+                box[2, 1] - box[0, 1] + offset[3]]
 
 
     def calc_green_mark_locate_area(self, roi, margin=None):
     def calc_green_mark_locate_area(self, roi, margin=None):
         """
         """
@@ -195,9 +201,11 @@ class ExtendGreenMark(GeneralBattle):
         @rtype:
         @rtype:
 
 
         """
         """
+        if roi is None:
+            return [0, 0, 1280, 720]
         result = [0, 0, 0, 0]
         result = [0, 0, 0, 0]
         if margin is None:
         if margin is None:
-            margin = [150, 40, 20, 80]
+            margin = [160, 40, 20, 80]
         result[0] = x if (x := roi[0] - margin[3]) > 0 else 0
         result[0] = x if (x := roi[0] - margin[3]) > 0 else 0
         result[1] = y if (y := roi[1] - margin[0]) > 0 else 0
         result[1] = y if (y := roi[1] - margin[0]) > 0 else 0
         result[2] = w if (w := roi[2] + margin[1] + margin[3]) + x <= 1280 else 1280 - x
         result[2] = w if (w := roi[2] + margin[1] + margin[3]) + x <= 1280 else 1280 - x
@@ -205,12 +213,18 @@ class ExtendGreenMark(GeneralBattle):
         return result
         return result
 
 
     def detect_green_mark(self, img=None, area=None):
     def detect_green_mark(self, img=None, area=None):
+        def init_green_marker_roi(roi):
+            self.I_GREEN_MARKER.roi_back = roi
+            self.I_GREEN_MARKER_LEFT_TOP.roi_back = roi
+            self.I_GREEN_MARKER_BOTTOM.roi_back = roi
+
+        # 初始化绿标相关变量的roi信息
         if area is not None:
         if area is not None:
-            self.I_GREEN_MARKER.roi_back = area
+            init_green_marker_roi(area)
         elif self._green_mark_detect_area is not None:
         elif self._green_mark_detect_area is not None:
-            self.I_GREEN_MARKER.roi_back = self._green_mark_detect_area
+            init_green_marker_roi(self._green_mark_detect_area)
         else:
         else:
-            self.I_GREEN_MARKER.roi_back = (0, 0, 1280, 720)
+            init_green_marker_roi((0, 0, 1280, 720))
 
 
         if img is not None:
         if img is not None:
             self.device.image = img
             self.device.image = img
@@ -221,7 +235,10 @@ class ExtendGreenMark(GeneralBattle):
             upper_green = np.array([80, 255, 232])
             upper_green = np.array([80, 255, 232])
             mask = cv2.inRange(hsv_image, lower_green, upper_green)
             mask = cv2.inRange(hsv_image, lower_green, upper_green)
             result = cv2.bitwise_and(image, image, mask=mask)
             result = cv2.bitwise_and(image, image, mask=mask)
-            res = self.I_GREEN_MARKER.match(result)
+            # 伤害数字,御魂生效后弹出会遮挡绿标信息,目前的策略:尽量的延长检测到绿标的时间
+            res = (self.I_GREEN_MARKER_LEFT_TOP.match(result)
+                   or self.I_GREEN_MARKER_BOTTOM.match(result)
+                   or self.I_GREEN_MARKER.match(result))
             return res
             return res
 
 
         if detect_green_marker_base(self.device.image):
         if detect_green_marker_base(self.device.image):
@@ -236,7 +253,7 @@ class ExtendGreenMark(GeneralBattle):
         """
         """
         self.screenshot()
         self.screenshot()
         # 若未初始化,直接返回,不检测绿标状态
         # 若未初始化,直接返回,不检测绿标状态
-        if self._state == GreenMarkState.NOT_INIT:
+        if self._state == GreenMarkState.NOT_INIT or self._state is None:
             return self.device.image
             return self.device.image
 
 
         # 检测式神名区域
         # 检测式神名区域
@@ -249,8 +266,11 @@ class ExtendGreenMark(GeneralBattle):
         if self.detect_green_mark(self.device.image):
         if self.detect_green_mark(self.device.image):
             self._disappear_count = 0
             self._disappear_count = 0
             self._disappear_timer.reset()
             self._disappear_timer.reset()
+            logger.info("green mark appear")
             return self.device.image
             return self.device.image
 
 
+        if self._disappear_count == 0:
+            logger.info("green mark DISappear")
         self._disappear_count += 1
         self._disappear_count += 1
         self._disappear_timer.start()
         self._disappear_timer.start()
         if self.need_green_mark():
         if self.need_green_mark():
@@ -293,6 +313,8 @@ class ExtendGreenMark(GeneralBattle):
 
 
     def start_green_mark(self):
     def start_green_mark(self):
         self._state = GreenMarkState.INITED
         self._state = GreenMarkState.INITED
+        self._disappear_timer.clear()
+        self._disappear_count = 0
 
 
     def stop_green_mark(self):
     def stop_green_mark(self):
         self._state = GreenMarkState.NOT_INIT
         self._state = GreenMarkState.NOT_INIT

+ 4 - 3
tasks/Dokan/script_task.py

@@ -962,6 +962,7 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
         :return: 战斗成功(True) or 战斗失败(False) or 区域不可用(False)
         :return: 战斗成功(True) or 战斗失败(False) or 区域不可用(False)
         @type count: int 战斗次数限制
         @type count: int 战斗次数限制
         """
         """
+
         def anti_wait_long_time():
         def anti_wait_long_time():
             self.device.stuck_record_add("BATTLE_STATUS_S")
             self.device.stuck_record_add("BATTLE_STATUS_S")
 
 
@@ -1037,15 +1038,15 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
                     logger.info("--------New battle starts---------")
                     logger.info("--------New battle starts---------")
                     # 初始化 green_mark
                     # 初始化 green_mark
                     self.init_green_mark_from_cfg(self.config.model)
                     self.init_green_mark_from_cfg(self.config.model)
-                    # 长延时防止过快点击
-                    self.ui_click_until_disappear(self.I_RYOU_DOKAN_IN_FIELD, interval=1.3)
+                    #
+                    self.ui_click_until_disappear(self.I_RYOU_DOKAN_IN_FIELD, interval=0.4)
                     anti_wait_long_time()
                     anti_wait_long_time()
                     count -= 1
                     count -= 1
                     continue
                     continue
                 if count <= 0:
                 if count <= 0:
                     win = True
                     win = True
                     break
                     break
-
+            sleep(0.02)
             continue
             continue
 
 
         self.stop_green_mark()
         self.stop_green_mark()