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

feat(WantedQuests):
appear_highlight,用于检测按钮是否高亮,用来判断是否已经切换到跨服好友列表
添加缺失的description;

ChengRanORZ 1 год назад
Родитель
Сommit
81c9342573

+ 1 - 1
tasks/Component/SwitchAccount/switch_account_config.py

@@ -16,7 +16,7 @@ class AccountInfo(BaseModel):
     svr: str = Field(default="", description="svr_help")
     account: str = Field(default="", description="account_help")
     # 为防止ocr出错 暂定格式 字符串以#分割
-    accountAlias: str = Field(default="", description="")
+    accountAlias: str = Field(default="", description="account_alias_help")
     appleOrAndroid: bool = Field(default=True, description="apple_or_android_help")
     # 上一次执行成功的时间 ,防止出错时重复登录浪费时间
     last_complete_time: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"), description="last_complete_time_help")

+ 1 - 3
tasks/FindJade/README.md

@@ -1,6 +1,3 @@
-详细配置文件见config/findjade/find_jade.json
-
-
 ### **注意事项:**
 
 1. 可以配置多个被邀请对象,但每次只会按从前到后的顺序邀请一个.
@@ -12,3 +9,4 @@
 ### **运行中可能出现的问题:**
 1. 小号存在打不过的情况,导致邀请完成后,无法完成任务,需手动搞一下 
 2. 由于本人电脑配置一般(16GB内存,5个模拟器满载),所以部分延时写的挺长,可以根据情况酌情调整
+

+ 3 - 2
tasks/FindJade/config.py

@@ -17,8 +17,9 @@ class InviteHistoryItem(BaseModel):
 
 class InviteInfo(BaseModel):
     # 被邀请人员昵称
-    name: str = Field(default="")
-    default_invite_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.JadeAndFood)
+    name: str = Field(default="", description='name_help')
+    default_invite_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.JadeAndFood,
+                                                                  description='default_invite_type_help')
 
     # 协作任务类型   上次邀请时间
     invite_history_1: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"),

+ 4 - 0
tasks/WantedQuests/assets.py

@@ -86,10 +86,14 @@ class WantedQuestsAssets:
 	I_WQ_INVITE_CANCEL = RuleImage(roi_front=(230,540,132,60), roi_back=(230,540,140,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_cancel.png")
 	# 邀请好友被选中标记 
 	I_WQ_INVITE_SELECTED = RuleImage(roi_front=(370,180,32,32), roi_back=(370,180,370,355), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_selected.png")
+	# 邀请好友被选中标记 
+	I_WQ_INVITE_FRIEND_LIST_APPEAR = RuleImage(roi_front=(370,180,32,32), roi_back=(370,180,370,355), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_friend_list_appear.png")
 	# 邀请同服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	I_WQ_INVITE_SAME_SVR = RuleImage(roi_front=(170,90,60,35), roi_back=(170,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_same_svr.png")
 	# 邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	I_WQ_INVITE_DIFF_SVR = RuleImage(roi_front=(280,90,60,35), roi_back=(280,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_diff_svr.png")
+	# 邀请跨服好友,已选中状态,高亮状态 
+	I_WQ_INVITE_DIFF_SVR_HIGHLIGHT = RuleImage(roi_front=(260,70,120,90), roi_back=(260,70,120,90), threshold=0.9, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_diff_svr_highlight.png")
 	# 从左到右第一个协作任务的类型 
 	I_WQ_COOPERATION_TYPE_GOLD_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_gold.png")
 	# 从左到右第一个协作任务的类型 

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

@@ -98,6 +98,15 @@
     "threshold": 0.8,
     "description": "邀请好友被选中标记"
   },
+  {
+    "itemName": "wq_invite_friend_list_appear",
+    "imageName": "wq_invite_friend_list_appear.png",
+    "roiFront": "370,180,32,32",
+    "roiBack": "370,180,370,355",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "好友列表已加载标志"
+  },
   {
     "itemName": "wq_invite_same_svr",
     "imageName": "wq_invite_same_svr.png",
@@ -116,6 +125,15 @@
     "threshold": 0.8,
     "description": "邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息"
   },
+  {
+    "itemName": "wq_invite_diff_svr_highlight",
+    "imageName": "wq_invite_diff_svr_highlight.png",
+    "roiFront": "260,70,120,90",
+    "roiBack": "260,70,120,90",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "邀请跨服好友,已选中状态,高亮状态"
+  },
   {
     "itemName": "wq_cooperation_type_gold_1",
     "imageName": "wq_cooperation_type_gold.png",

BIN
tasks/WantedQuests/invite/wq_invite_diff_svr_highlight.png


BIN
tasks/WantedQuests/invite/wq_invite_friend_list_appear.png


+ 57 - 9
tasks/WantedQuests/script_task.py

@@ -1,12 +1,15 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+import copy
 import re
 from datetime import timedelta, time, datetime
 from time import sleep
 from typing import List
 
+import cv2
 from cached_property import cached_property
+from markdown_it.rules_inline import image
 
 from module.atom.image import RuleImage
 from module.base.timer import Timer
@@ -461,8 +464,6 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         @return:
         """
         self.ui_click(btn, self.I_WQ_INVITE_ENSURE, interval=2.5)
-        # 等待好友列表加载
-        sleep(1.5)
 
         # 选人
         self.O_WQ_INVITE_COLUMN_1.keyword = name
@@ -470,21 +471,27 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
 
         find = False
         for i in range(2):
+            self.wait_until_appear(self.I_WQ_INVITE_FRIEND_LIST_APPEAR, wait_time=4)
             self.screenshot()
             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)
             find = in_col_2 or in_col_1
             if find:
-                sleep(4)
+                self.wait_until_appear(self.I_WQ_INVITE_SELECTED, wait_time=2)
                 self.screenshot()
                 if self.appear(self.I_WQ_INVITE_SELECTED):
                     logger.info("friend found and selected")
                     break
                 # TODO OCR识别到文字 但是没有选中 尝试重新选择  (选择好友时,弹出协作邀请导致选择好友失败)
-            # 在当前服务器没找到,切换服务器  30s 防止短时间连续点击
-            self.click(self.I_WQ_INVITE_DIFF_SVR, interval=30)
-            # NOTE 跨服好友刷新缓慢,切换标签页难以检测,姑且用延时.非常卡的模拟器可能出问题
-            sleep(4)
+            # 检测跨服好友按钮是否高亮
+            while 1:
+                self.screenshot()
+                if not self.appear_highlight(self.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT):
+                    self.click(self.I_WQ_INVITE_DIFF_SVR)
+                    continue
+                break
+            # 等待好友列表加载
+            self.wait_until_appear(self.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT, wait_time=4)
         # 没有找到需要邀请的人,点击取消 返回悬赏封印界面
         if not find:
             self.screenshot()
@@ -525,6 +532,39 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         logger.info(f"get cooperation size {len(retList)}")
         return retList
 
+    # 使用平均亮度检测是否一致
+    def appear_highlight(self, rule_image: RuleImage):
+        def compute_region_brightness(img, top_left, width, height):
+            """
+            计算目标区域的平均亮度 (灰度图的平均值)
+            :param img: 目标图像
+            :param top_left: 匹配区域的左上角坐标
+            :param width: 模板宽度
+            :param height: 模板高度
+            :return: 区域亮度均值
+            """
+            # 裁剪出匹配区域
+            region = img[top_left[1]:top_left[1] + height, top_left[0]:top_left[0] + width]
+            # 转为灰度图
+            gray_region = cv2.cvtColor(region, cv2.COLOR_BGR2GRAY)
+            # 计算灰度均值
+            return gray_region.mean()
+
+        src = rule_image.corp(self.device.image)
+        template = rule_image.image
+        result = cv2.matchTemplate(src, template, cv2.TM_CCOEFF_NORMED)
+        _, max_val, _, max_loc = cv2.minMaxLoc(result)
+
+        brightness_src = compute_region_brightness(src, max_loc, template.shape[1], template.shape[0])
+        brightness_template = compute_region_brightness(template, (0, 0), template.shape[1], template.shape[0])
+
+        if max_val > rule_image.threshold and (brightness_src >= brightness_template * rule_image.threshold) and (
+                brightness_src <= brightness_template * (2 - rule_image.threshold)):
+            rule_image.roi_front[0] = max_loc[0] + rule_image.roi_back[0]
+            rule_image.roi_front[1] = max_loc[1] + rule_image.roi_back[1]
+            return True
+        return False
+
     @cached_property
     def special_main(self) -> bool:
         # 特殊的庭院需要点一下,左边然后才能找到图标
@@ -561,6 +601,14 @@ if __name__ == '__main__':
     c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
-    t.screenshot()
+    img = cv2.imread(r"E:\highlight.png")
+    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+    t.device.image = img
+    appear = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
+
+    img = cv2.imread(r"E:\normal.png")
+    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+    t.device.image = img
+    appear_normal = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
 
-    t.run()
+    print(appear)