Prechádzať zdrojové kódy

fix(WantedQuests): 改悬赏任务检测为OCR识别'封'字

lhye 6 mesiacov pred
rodič
commit
690e55f481

+ 3 - 2
tasks/WantedQuests/assets.py

@@ -20,6 +20,8 @@ class WantedQuestsAssets:
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
+	# 探索界面检测是否有"封"字判断是否还有悬赏任务
+	O_WQ_LIST_TOP_BOTTOM_CHECK = RuleOcr(roi=(10,193,90,33), area=(10,193,90,33), mode="Single", method="Default", keyword="封", name="wq_list_top_bottom_check")
 	# 挑战券的数量 
 	# 挑战券的数量 
 	O_WQ_NUMBER = RuleOcr(roi=(569,13,50,32), area=(569,13,50,32), mode="Digit", method="Default", keyword="", name="wq_number")
 	O_WQ_NUMBER = RuleOcr(roi=(569,13,50,32), area=(569,13,50,32), mode="Digit", method="Default", keyword="", name="wq_number")
 	# 悬赏封印 
 	# 悬赏封印 
@@ -170,8 +172,7 @@ class WantedQuestsAssets:
 	I_WQ_TRACE_ONE_CHECK_OPENED = RuleImage(roi_front=(510,175,210,60), roi_back=(510,175,210,60), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_trace_one_check_opened.png")
 	I_WQ_TRACE_ONE_CHECK_OPENED = RuleImage(roi_front=(510,175,210,60), roi_back=(510,175,210,60), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_trace_one_check_opened.png")
 	# 庭院悬赏任务界面 单个任务点开后的界面 是否为现世任务标志 
 	# 庭院悬赏任务界面 单个任务点开后的界面 是否为现世任务标志 
 	I_WQ_TRACE_ONE_REALWORLD = RuleImage(roi_front=(850,470,180,180), roi_back=(850,470,180,180), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_trace_one_realworld.png")
 	I_WQ_TRACE_ONE_REALWORLD = RuleImage(roi_front=(850,470,180,180), roi_back=(850,470,180,180), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_trace_one_realworld.png")
-	# 探索界面,左侧任务列表右上角右下角标志 
-	I_WQ_LIST_TOP_BOTTOM_CHECK = RuleImage(roi_front=(120,125,25,425), roi_back=(120,125,25,425), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_list_top_bottom_check.png")
+
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 2 - 2
tasks/WantedQuests/script_task.py

@@ -749,8 +749,8 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         return -1, -1, -1, [0, 0, 0, 0]
         return -1, -1, -1, [0, 0, 0, 0]
 
 
     def is_wq_remained(self):
     def is_wq_remained(self):
-        # 检测是否还存在任务
-        return self.appear(self.I_WQ_LIST_TOP_BOTTOM_CHECK)
+        # 检测是否还存在任务,OCR识别"封"字
+        return self.ocr_appear(self.O_WQ_LIST_TOP_BOTTOM_CHECK)