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

fix(ReplaceShikigami): change image and add position stable method

Azure 1 год назад
Родитель
Сommit
818f286470

+ 7 - 7
tasks/Component/ReplaceShikigami/assets.py

@@ -52,17 +52,17 @@ class ReplaceShikigamiAssets:
 	# description 
 	I_RS_NO_ADD = RuleImage(roi_front=(276,222,100,212), roi_back=(28,181,1232,293), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_no_add.png")
 	# 素材 
-	I_RS_MATERIAL = RuleImage(roi_front=(822,620,59,56), roi_back=(129,597,774,98), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material.png")
+	I_RS_MATERIAL = RuleImage(roi_front=(38,286,54,52), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material.png")
 	# description 
-	I_RS_N = RuleImage(roi_front=(709,621,57,59), roi_back=(694,606,89,90), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_n.png")
+	I_RS_N = RuleImage(roi_front=(129,298,47,49), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_n.png")
 	# description 
-	I_RS_R = RuleImage(roi_front=(594,619,64,61), roi_back=(582,601,91,98), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_r.png")
+	I_RS_R = RuleImage(roi_front=(209,335,48,47), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_r.png")
 	# description 
-	I_RS_SR = RuleImage(roi_front=(483,619,62,58), roi_back=(470,603,90,96), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png")
+	I_RS_SR = RuleImage(roi_front=(279,388,48,47), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png")
 	# description 
-	I_RS_SSR = RuleImage(roi_front=(370,621,63,58), roi_back=(353,600,98,100), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png")
+	I_RS_SSR = RuleImage(roi_front=(331,457,53,46), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png")
 	# description 
-	I_RS_SP = RuleImage(roi_front=(260,621,58,60), roi_back=(246,605,92,90), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png")
+	I_RS_SP = RuleImage(roi_front=(368,537,48,47), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png")
 	# description 
 	I_RS_MATERIAL_SELECTED = RuleImage(roi_front=(27,620,68,65), roi_back=(27,620,68,65), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material_selected.png")
 	# description 
@@ -82,7 +82,7 @@ class ReplaceShikigamiAssets:
 	# 智能放入 
 	I_RS_SMART_EXCHANGE = RuleImage(roi_front=(1150,507,40,44), roi_back=(1128,488,86,162), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_smart_exchange.png")
 	# description 
-	I_RS_UR = RuleImage(roi_front=(149,623,56,58), roi_back=(136,603,88,95), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png")
+	I_RS_UR = RuleImage(roi_front=(377,627,49,46), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png")
 	# description 
 	I_RS_UR_SELECTED = RuleImage(roi_front=(36,620,54,58), roi_back=(14,601,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur_selected.png")
 

+ 3 - 1
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -51,7 +51,9 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
 
             if self.appear(check_selected):
                 break
-            if self.appear_then_click(check_click, interval=1):
+            if self.appear(check_click, interval=1):
+                if self.wait_until_pos_stable(check_click, stable_time=0.8, timeout=3):
+                    self.click(check_click)
                 continue
             if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3):
                 continue

+ 14 - 14
tasks/Component/ReplaceShikigami/rs/image.json

@@ -11,8 +11,8 @@
   {
     "itemName": "rs_material",
     "imageName": "rs_rs_material.png",
-    "roiFront": "822,620,59,56",
-    "roiBack": "129,597,774,98",
+    "roiFront": "38,286,54,52",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "素材"
@@ -20,8 +20,8 @@
   {
     "itemName": "rs_n",
     "imageName": "rs_rs_n.png",
-    "roiFront": "709,621,57,59",
-    "roiBack": "694,606,89,90",
+    "roiFront": "129,298,47,49",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "rs_r",
     "imageName": "rs_rs_r.png",
-    "roiFront": "594,619,64,61",
-    "roiBack": "582,601,91,98",
+    "roiFront": "209,335,48,47",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "rs_sr",
     "imageName": "rs_rs_sr.png",
-    "roiFront": "483,619,62,58",
-    "roiBack": "470,603,90,96",
+    "roiFront": "279,388,48,47",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -47,8 +47,8 @@
   {
     "itemName": "rs_ssr",
     "imageName": "rs_rs_ssr.png",
-    "roiFront": "370,621,63,58",
-    "roiBack": "353,600,98,100",
+    "roiFront": "331,457,53,46",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -56,8 +56,8 @@
   {
     "itemName": "rs_sp",
     "imageName": "rs_rs_sp.png",
-    "roiFront": "260,621,58,60",
-    "roiBack": "246,605,92,90",
+    "roiFront": "368,537,48,47",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -146,8 +146,8 @@
   {
     "itemName": "rs_ur",
     "imageName": "rs_rs_ur.png",
-    "roiFront": "149,623,56,58",
-    "roiBack": "136,603,88,95",
+    "roiFront": "377,627,49,46",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_material.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_n.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_r.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png


+ 43 - 2
tasks/base_task.py

@@ -162,7 +162,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         :param target: 匹配的目标可以是RuleImage, 也可以是RuleOcr
         :param interval:
         :param threshold:
-        :return:
+        :return: interval时间到达且匹配成功则返回True, 否则False
         """
         if interval:
             if target.name in self.interval_timer:
@@ -273,6 +273,47 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             if not self.appear(target):
                 break
 
+    def wait_until_pos_stable(self, target: RuleImage, stable_time: float = 0.3, timeout: float = 2,
+                              threshold: float = None, skip_first_screenshot: bool = True) -> bool:
+        """
+        等待直到在同一位置稳定出现
+        :param skip_first_screenshot:
+        :param threshold: target匹配阈值
+        :param target: 目标图像
+        :param stable_time: 判断是否稳定的时间
+        :param timeout: 等待稳定的超时时间
+        :return: timer时间内稳定出现则返回True, 否则False
+        """
+        logger.info(f'Wait until {target.name} position stable')
+        timeout_timer = Timer(timeout).start()
+        stable_timer = Timer(stable_time).start()
+        pre_roi_front, cur_roi_front = None, None
+        origin_roi_back = target.roi_back
+        while not timeout_timer.reached():
+            self.maybe_screenshot(skip_first_screenshot)
+            skip_first_screenshot = False
+            # 当前页面能够匹配到target
+            if target.match(self.device.image, threshold=threshold):
+                cur_roi_front = target.roi_front
+                logger.info(f'Current:{cur_roi_front}, pre:{pre_roi_front}')
+                target.roi_back = pre_roi_front
+                # 上一次匹配到的位置还能匹配到target
+                if pre_roi_front is not None and target.match(self.device.image, threshold=threshold):
+                    # 到达稳定时间
+                    if stable_timer.reached():
+                        logger.info(f'{target.name} position has stabilized')
+                        return True
+                else:
+                    stable_timer.reset()  # 上一次匹配到的位置这次匹配不到了, 重置定时器
+            else:
+                stable_timer.reset()  # 当前页面都匹配不到, 重置定时器
+            # 记录这一次的target位置
+            pre_roi_front = cur_roi_front
+            # 还原target的匹配区域
+            target.roi_back = origin_roi_back
+        logger.warning(f'Wait until pos stable({target}) timeout')
+        return False
+
     def wait_until_stable(self,
                           target: RuleImage,
                           timer=Timer(0.3, count=1),
@@ -372,7 +413,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             # logger.info(f'Swipe {swipe.name}')
             self.interval_timer[swipe.name].reset()
 
-    def click(self, click: Union[RuleClick, RuleLongClick] = None, interval: float = None) -> bool:
+    def click(self, click: Union[RuleClick, RuleLongClick, RuleImage, RuleOcr] = None, interval: float = None) -> bool:
         """
         点击或者长按
         :param interval: