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

Revert "移除部分sleep"

This reverts commit 83a6e42993cb01d3d783ead8ff1b1a8fd7ec7678.
ChengRanORZ 1 год назад
Родитель
Сommit
622910154b

+ 2 - 4
tasks/Restart/assets.py

@@ -1,9 +1,7 @@
-from module.atom.image import RuleImage
 from module.atom.click import RuleClick
 from module.atom.click import RuleClick
-from module.atom.long_click import RuleLongClick
-from module.atom.swipe import RuleSwipe
+from module.atom.image import RuleImage
 from module.atom.ocr import RuleOcr
 from module.atom.ocr import RuleOcr
-from module.atom.list import RuleList
+
 
 
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 # Don't modify it manually.

+ 0 - 2
tasks/WantedQuests/assets.py

@@ -120,8 +120,6 @@ class WantedQuestsAssets:
 	I_WQ_COOPERATION_TYPE_CAT_FOOD_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_cat_food.png")
 	I_WQ_COOPERATION_TYPE_CAT_FOOD_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_cat_food.png")
 	# 从左到右第三个协作任务的类型 
 	# 从左到右第三个协作任务的类型 
 	I_WQ_COOPERATION_TYPE_SUSHI_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_sushi.png")
 	I_WQ_COOPERATION_TYPE_SUSHI_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_sushi.png")
-	# 好友列表刷新缓慢,用作刷新出来的标志 
-	I_WQ_INVITE_FRIEND_LIST_APPEAR = RuleImage(roi_front=(400,240,40,40), roi_back=(400,240,40,40), threshold=0.9, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_friend_list_appear.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

+ 0 - 9
tasks/WantedQuests/invite/image.json

@@ -250,14 +250,5 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "从左到右第三个协作任务的类型"
     "description": "从左到右第三个协作任务的类型"
-  },
-  {
-    "itemName": "wq_invite_friend_list_appear",
-    "imageName": "wq_invite_friend_list_appear.png",
-    "roiFront": "400,240,40,40",
-    "roiBack": "400,240,40,40",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "好友列表刷新缓慢,用作刷新出来的标志"
   }
   }
 ]
 ]

BIN
tasks/WantedQuests/invite/wa_invite_friend_list_appear.png


+ 13 - 25
tasks/WantedQuests/script_task.py

@@ -227,6 +227,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
                 continue
                 continue
             # 根据邀请按钮位置生成 对应的点击位置 打开追踪界面
             # 根据邀请按钮位置生成 对应的点击位置 打开追踪界面
             # NOTE magic Number
             # NOTE magic Number
+
             self.device.click(btn.roi_front[0], btn.roi_front[1] - 40, control_name=str(btn) + ' y-40')
             self.device.click(btn.roi_front[0], btn.roi_front[1] - 40, control_name=str(btn) + ' y-40')
             # 防止点击后界面来不及刷新
             # 防止点击后界面来不及刷新
             sleep(1.5)
             sleep(1.5)
@@ -398,7 +399,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         self.invite_random(self.I_WQ_INVITE_2)
         self.invite_random(self.I_WQ_INVITE_2)
         self.invite_random(self.I_WQ_INVITE_3)
         self.invite_random(self.I_WQ_INVITE_3)
 
 
-    def all_cooperation_invite(self, name: str = None):
+    def all_cooperation_invite(self, name: str=None):
         """
         """
             所有的协作任务依次邀请
             所有的协作任务依次邀请
             如果配置了只完成协作任务 还会将该任务设置为追踪
             如果配置了只完成协作任务 还会将该任务设置为追踪
@@ -457,7 +458,9 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         @param name:
         @param name:
         @return:
         @return:
         """
         """
-        self.ui_click(btn, stop=self.I_WQ_INVITE_ENSURE, interval=2.5)
+        self.ui_click(btn, self.I_WQ_INVITE_ENSURE, interval=2.5)
+        # 等待好友列表加载
+        sleep(1.5)
 
 
         # 选人
         # 选人
         self.O_WQ_INVITE_COLUMN_1.keyword = name
         self.O_WQ_INVITE_COLUMN_1.keyword = name
@@ -465,22 +468,21 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
 
 
         find = False
         find = False
         for i in range(2):
         for i in range(2):
-            # 等待好友列表出现
-            self.wait_until_appear(self.I_WQ_INVITE_FRIEND_LIST_APPEAR, True, wait_time=4)
-
+            self.screenshot()
             in_col_1 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_1)
             in_col_1 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_1)
             in_col_2 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_2)
             in_col_2 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_2)
             find = in_col_2 or in_col_1
             find = in_col_2 or in_col_1
             if find:
             if find:
-                self.wait_until_appear(self.I_WQ_INVITE_SELECTED, skip_first_screenshot=True, wait_time=4)
+                sleep(4)
+                self.screenshot()
                 if self.appear(self.I_WQ_INVITE_SELECTED):
                 if self.appear(self.I_WQ_INVITE_SELECTED):
                     logger.info("friend found and selected")
                     logger.info("friend found and selected")
                     break
                     break
                 # TODO OCR识别到文字 但是没有选中 尝试重新选择  (选择好友时,弹出协作邀请导致选择好友失败)
                 # TODO OCR识别到文字 但是没有选中 尝试重新选择  (选择好友时,弹出协作邀请导致选择好友失败)
             # 在当前服务器没找到,切换服务器  30s 防止短时间连续点击
             # 在当前服务器没找到,切换服务器  30s 防止短时间连续点击
             self.click(self.I_WQ_INVITE_DIFF_SVR, interval=30)
             self.click(self.I_WQ_INVITE_DIFF_SVR, interval=30)
-            # 截次图用以等待同服务器好友列表消失
-            self.screenshot()
+            # NOTE 跨服好友刷新缓慢,切换标签页难以检测,姑且用延时.非常卡的模拟器可能出问题
+            sleep(4)
         # 没有找到需要邀请的人,点击取消 返回悬赏封印界面
         # 没有找到需要邀请的人,点击取消 返回悬赏封印界面
         if not find:
         if not find:
             self.screenshot()
             self.screenshot()
@@ -554,25 +556,11 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
 
 
-    import cv2
-    import numpy as np
-
-    target_image = cv2.imread('E:\\friend.png')
-    template_image = cv2.imread('E:\\friend_1.png')
-    result = cv2.matchTemplate(target_image, template_image, cv2.TM_CCOEFF_NORMED)
-    w = 30
-    h = 30
-    loc = np.where(result >= 0.9)
-    # 在目标图像上绘制矩形框标记匹配位置
-    for pt in zip(*loc[::-1]):
-        cv2.rectangle(target_image, pt, (pt[0] + w, pt[1] + h), (0, 255, 0), 2)
-
-    # 显示结果图像
-    cv2.imshow('Detected', target_image)
-    cv2.waitKey(0)
-    cv2.destroyAllWindows()
     c = Config('oas1')
     c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
+    t.screenshot()
 
 
     t.run()
     t.run()
+
+