1. 优化相关OCR结果,使其符合预期

2. 优化任务流程,增加任务列表滑动,使其存在两个未完成协作任务时,其他任务能正常执行完成
3. 优化探索任务流程,使其不再强制需求固定式神上阵
4. 增加根据任务式神名称跳过功能（酒吞）
5. 优化任务选择，在秘闻能够提供3个及以上的进度时，优先选择秘闻
6. 修复coorperation_only模式下，任务全部完成时，卡死的BUG

Author: ChengRanORZ

dev_tools/assets_extract.py

@@ -408,7 +408,11 @@ def __init__(self):
         self.task_paths = [x for x in self.task_paths if 'Component' not in x]
         self.task_paths.extend([str(x) for x in (self.task_path / 'Component').iterdir() if x.is_dir()])
 
-        process_map(self.work, self.task_paths, max_workers=1)
+        # process_map(self.work, self.task_paths, max_workers=1)
+        for task_path in self.task_paths:
+            me = AssetsExtractor(task_path)
+            me.extract()
+
 
     @staticmethod
     def work(task_path: str):

tasks/WantedQuests/assets.py

@@ -52,6 +52,10 @@ class WantedQuestsAssets:
 	O_WQ_INFO_3 = RuleOcr(roi=(612,376,305,44), area=(612,376,305,44), mode="Single", method="Default", keyword="", name="wq_info_3")
 	# Ocr-description 
 	O_WQ_INFO_4 = RuleOcr(roi=(613,446,315,44), area=(613,446,315,44), mode="Single", method="Default", keyword="", name="wq_info_4")
+	# 怪物名称,如酒吞，阎魔等 
+	O_WQ_MONSTER_TYPE = RuleOcr(roi=(165,215,45,175), area=(165,215,45,175), mode="Full", method="Default", keyword="", name="wq_monster_type")
+	#  
+	O_WQ_TEXT_ALL = RuleOcr(roi=(20,140,110,390), area=(20,140,110,390), mode="Full", method="Default", keyword="", name="wq_text_all")
 
 
 	# Image Rule Assets
@@ -166,6 +170,8 @@ 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_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
@@ -177,3 +183,8 @@ class WantedQuestsAssets:
 	I_WQ_NIAN = RuleImage(roi_front=(19,176,100,100), roi_back=(0,153,166,273), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_wq_nian.png")
 
 
+	# Swipe Rule Assets
+	# 手指向上滑动 
+	S_WQ_LIST_UP = RuleSwipe(roi_front=(60,250,2,4), roi_back=(65,200,2,4), mode="default", name="wq_list_up")
+
+

tasks/WantedQuests/config.py

@@ -92,6 +92,8 @@ class WantedQuestsConfig(BaseModel):
     battle_priority: str = Field(default='挑战 > 秘闻 > 探索', description='battle_priority_help')
     # 只完成协作任务
     cooperation_only: bool = Field(default=False, description="cooperation_only_help")
+    # 忽略任务的任务目标名称（“酒吞童子”等）,多个用逗号“，,"分隔
+    unwanted_boss_names: str = Field(default='酒吞童子,阎魔', description='unwanted_boss_name_help')
 
 
 class WantedQuests(ConfigBase):

tasks/WantedQuests/explore.py

@@ -43,6 +43,7 @@ def explore(self, goto: RuleImage, num: int):
                     if explore_only_boss:
                         raise ExploreWantedBoss
                     break
+                logger.info("点击探索")
                 self.ui_click(self.I_E_EXPLORATION_CLICK, stop=self.I_E_SETTINGS_BUTTON)
                 continue
             # 探索大世界
@@ -59,16 +60,16 @@ def explore(self, goto: RuleImage, num: int):
                 continue
             # 探索里面
             elif scene == Scene.MAIN:
-                if not explore_init:
-                    count=0
-                    while count<5:
-                        if self.appear(self.I_E_AUTO_ROTATE_ON):
-                            break
-                        if self.appear(self.I_E_AUTO_ROTATE_OFF, interval=1.5):
-                            self.click(self.I_E_AUTO_ROTATE_OFF)
-                            count+=1
-                    explore_init = True
-                    continue
+                # if not explore_init:
+                #     count = 0
+                #     while count < 5:
+                #         if self.appear(self.I_E_AUTO_ROTATE_ON):
+                #             break
+                #         if self.appear(self.I_E_AUTO_ROTATE_OFF, interval=1.5):
+                #             self.click(self.I_E_AUTO_ROTATE_OFF)
+                #             count += 1
+                #     explore_init = True
+                #     continue
                 # 小纸人
                 if self.appear(self.I_BATTLE_REWARD):
                     if self.ui_get_reward(self.I_BATTLE_REWARD):
@@ -84,6 +85,7 @@ def explore(self, goto: RuleImage, num: int):
                 if self.appear(self.TEMPLATE_GIF) and self.fire(self.TEMPLATE_GIF):
                     explore_only_boss = False
                     logger.info(f'Fight, minions cnt {self.minions_cnt}')
+                    continue
                 # 向后拉,寻找怪
                 if search_fail_cnt >= 4:
                     search_fail_cnt = 0
@@ -95,6 +97,8 @@ def explore(self, goto: RuleImage, num: int):
                         continue
                 else:
                     search_fail_cnt += 1
+            elif scene==Scene.BATTLE_PREPARE:
+                self.ui_click_until_disappear(self.I_PREPARE_HIGHLIGHT, interval=0.5)
             elif scene == Scene.UNKNOWN:
                 continue
 
@@ -107,4 +111,4 @@ def explore(self, goto: RuleImage, num: int):
     config = Config('oas1')
     device = Device(config)
     t = WQExplore(config, device)
-    t.explore(goto=WantedQuestsAssets.I_GOTO_1, num=2)
+    t.explore(goto=WantedQuestsAssets.I_GOTO_1, num=2)

tasks/WantedQuests/ocr.json

@@ -142,5 +142,23 @@
     "method": "Default",
     "keyword": "",
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "wq_monster_type",
+    "roiFront": "165,215,45,175",
+    "roiBack": "165,215,45,175",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "怪物名称,如酒吞，阎魔等"
+  },
+  {
+    "itemName": "wq_text_all",
+    "roiFront": "20,140,110,390",
+    "roiBack": "20,140,110,390",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": ""
   }
 ]