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

fix(DemonEncounter): 优化boss搜索容错、收缩灯笼点击区、补信件答谢

- boss搜索: 用无sleep轮询替换Timer超时; 每轮搜索前若地图中央出现未购买宝箱展示(I_DE_BOX_CENTER)先点左下角定位挪开, 并保留误点后弹出50勾玉购买界面(I_JADE_50)的事后补救; 每轮至多2次搜索+2次中央点击, 失败则重进逢魔之时清状态, 最多3轮, 仍失败抛GameStuckError
- 灯笼: 收缩 C_DE_1~4 点击区仅包住内部图形, 新增 C_DE_MATCH_1~4 作为类型识别搜索区(与点击区分离, 避免分类模板误判为battle)
- 信件答题结束: 等待延长至2.5s并补点获得奖励弹窗(ui_reward_appear_click)
User 1 месяц назад
Родитель
Сommit
194a3eda21

+ 15 - 5
tasks/DemonEncounter/assets.py

@@ -60,14 +60,22 @@ class DemonEncounterAssets:
 
 
 
 
 	# Click Rule Assets
 	# Click Rule Assets
-	# 从下开始数第一个 
-	C_DE_1 = RuleClick(roi_front=(1211,478,61,58), roi_back=(1211,478,61,58), name="de_1")
+	# 从下开始数第一个(点击区已收缩, 仅包住内部图形)
+	C_DE_1 = RuleClick(roi_front=(1222,497,39,25), roi_back=(1222,497,39,25), name="de_1")
 	# 2 
 	# 2 
-	C_DE_2 = RuleClick(roi_front=(1196,409,55,56), roi_back=(1196,409,55,56), name="de_2")
+	C_DE_2 = RuleClick(roi_front=(1204,424,39,31), roi_back=(1204,424,39,31), name="de_2")
 	# 3 
 	# 3 
-	C_DE_3 = RuleClick(roi_front=(1225,344,53,55), roi_back=(1225,344,53,55), name="de_3")
+	C_DE_3 = RuleClick(roi_front=(1234,364,32,22), roi_back=(1234,364,32,22), name="de_3")
 	# 第四个 
 	# 第四个 
-	C_DE_4 = RuleClick(roi_front=(1200,282,56,53), roi_back=(1200,282,56,53), name="de_4")
+	C_DE_4 = RuleClick(roi_front=(1214,297,34,27), roi_back=(1214,297,34,27), name="de_4")
+	# 灯笼1类型识别搜索区(须容纳完整灯笼图案, 仅供check_lantern匹配, 不用于点击)
+	C_DE_MATCH_1 = RuleClick(roi_front=(1211,478,61,58), roi_back=(1211,478,61,58), name="de_match_1")
+	# 灯笼2类型识别搜索区
+	C_DE_MATCH_2 = RuleClick(roi_front=(1196,409,55,56), roi_back=(1196,409,55,56), name="de_match_2")
+	# 灯笼3类型识别搜索区
+	C_DE_MATCH_3 = RuleClick(roi_front=(1225,344,53,55), roi_back=(1225,344,53,55), name="de_match_3")
+	# 灯笼4类型识别搜索区
+	C_DE_MATCH_4 = RuleClick(roi_front=(1200,282,56,53), roi_back=(1200,282,56,53), name="de_match_4")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
@@ -96,6 +104,8 @@ class DemonEncounterAssets:
 	I_DE_BALLOON = RuleImage(roi_front=(1214,295,28,27), roi_back=(1198,269,81,266), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_balloon.png")
 	I_DE_BALLOON = RuleImage(roi_front=(1214,295,28,27), roi_back=(1198,269,81,266), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_balloon.png")
 	# 右侧的宝箱 
 	# 右侧的宝箱 
 	I_DE_BOX = RuleImage(roi_front=(1210,295,34,33), roi_back=(1183,278,96,277), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_box.png")
 	I_DE_BOX = RuleImage(roi_front=(1210,295,34,33), roi_back=(1183,278,96,277), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_box.png")
+	# 地图中央未购买的宝箱展示 
+	I_DE_BOX_CENTER = RuleImage(roi_front=(618,325,45,34), roi_back=(547,264,190,157), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_box_center.png")
 	# 挑战某一个后的封印图片 
 	# 挑战某一个后的封印图片 
 	I_DE_DEFEAT_2 = RuleImage(roi_front=(1211,422,28,35), roi_back=(1211,422,28,35), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_2.png")
 	I_DE_DEFEAT_2 = RuleImage(roi_front=(1211,422,28,35), roi_back=(1211,422,28,35), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_2.png")
 	# description 
 	# description 

+ 32 - 8
tasks/DemonEncounter/demon/click.json

@@ -1,26 +1,50 @@
 [
 [
   {
   {
     "itemName": "de_1",
     "itemName": "de_1",
-    "roiFront": "1211,478,61,58",
-    "roiBack": "1211,478,61,58",
+    "roiFront": "1222,497,39,25",
+    "roiBack": "1222,497,39,25",
     "description": "从下开始数第一个"
     "description": "从下开始数第一个"
   },
   },
   {
   {
     "itemName": "de_2",
     "itemName": "de_2",
-    "roiFront": "1196,409,55,56",
-    "roiBack": "1196,409,55,56",
+    "roiFront": "1204,424,39,31",
+    "roiBack": "1204,424,39,31",
     "description": "2"
     "description": "2"
   },
   },
   {
   {
     "itemName": "de_3",
     "itemName": "de_3",
-    "roiFront": "1225,344,53,55",
-    "roiBack": "1225,344,53,55",
+    "roiFront": "1234,364,32,22",
+    "roiBack": "1234,364,32,22",
     "description": "3"
     "description": "3"
   },
   },
   {
   {
     "itemName": "de_4",
     "itemName": "de_4",
+    "roiFront": "1214,297,34,27",
+    "roiBack": "1214,297,34,27",
+    "description": "第四个"
+  },
+  {
+    "itemName": "de_match_1",
+    "roiFront": "1211,478,61,58",
+    "roiBack": "1211,478,61,58",
+    "description": "灯笼1类型识别搜索区(须容纳完整灯笼图案, 仅供check_lantern匹配, 不用于点击)"
+  },
+  {
+    "itemName": "de_match_2",
+    "roiFront": "1196,409,55,56",
+    "roiBack": "1196,409,55,56",
+    "description": "灯笼2类型识别搜索区"
+  },
+  {
+    "itemName": "de_match_3",
+    "roiFront": "1225,344,53,55",
+    "roiBack": "1225,344,53,55",
+    "description": "灯笼3类型识别搜索区"
+  },
+  {
+    "itemName": "de_match_4",
     "roiFront": "1200,282,56,53",
     "roiFront": "1200,282,56,53",
     "roiBack": "1200,282,56,53",
     "roiBack": "1200,282,56,53",
-    "description": "第四个"
+    "description": "灯笼4类型识别搜索区"
   }
   }
-]
+]

BIN
tasks/DemonEncounter/demon/demon_de_box_center.png


+ 10 - 1
tasks/DemonEncounter/demon/image.json

@@ -79,5 +79,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "50勾玉购买"
     "description": "50勾玉购买"
+  },
+  {
+    "itemName": "de_box_center",
+    "imageName": "demon_de_box_center.png",
+    "roiFront": "618,325,45,34",
+    "roiBack": "547,264,190,157",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "地图中央未购买的宝箱展示"
   }
   }
-]
+]

+ 76 - 36
tasks/DemonEncounter/script_task.py

@@ -94,40 +94,77 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         logger.hr('Start boss battle', 1)
         logger.hr('Start boss battle', 1)
 
 
         def find_boss():
         def find_boss():
-            find_btn_clicked = False
-            timer_find_boss = Timer(10 * 60)
-            timer_find_boss.start()
-            while 1:
+            search_button = self.I_DE_BOSS_BEST if self.best_demon_enable else self.I_DE_BOSS
+            boss_name = 'best boss' if self.best_demon_enable else 'normal boss'
+
+            # 每轮搜索前若中央有未购买的宝箱展示, 先点左下角定位(小指针)把它挪开;
+            # 一整轮(2次搜索)都没找到则重进逢魔之时清状态, 最多3轮。
+            for reenter_round in range(1, 4):
                 self.screenshot()
                 self.screenshot()
-                if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
-                    break
-                if timer_find_boss.reached():
-                    logger.warning('find boss timeout')
-                    self.set_next_run(task='DemonEncounter', success=False, finish=True, server=False)
-                    raise TaskEnd('DemonEncounter')
-                if self.appear(self.I_JADE_50):
-                    # 没找到boss但地图中央出现宝箱,导致点击宝箱出现50勾玉购买界面
-                    self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
-                    continue
-                if find_btn_clicked and self.click(self.C_DM_BOSS_CLICK, interval=5):
-                    find_btn_clicked = False
-                    continue
-                if self.best_demon_enable:
+                if self.appear(self.I_DE_BOX_CENTER):
+                    logger.info(
+                        f'Box display at map center, click location to reset view '
+                        f'(round {reenter_round}/3)'
+                    )
+                    self.appear_then_click(self.I_DE_LOCATION, interval=2)
+                    time.sleep(1)
+
+                # 最多重新执行两轮“逢魔/极逢魔 -> 地图中央首领”的完整流程。
+                for search_attempt in range(1, 3):
                     self.device.click_record_clear()
                     self.device.click_record_clear()
-                    if self.appear(self.I_DE_BOSS_BEST) and (not find_btn_clicked):
-                        self.device.click_record_remove(self.I_DE_BOSS_BEST)
-                        if self.click(self.I_DE_BOSS_BEST, interval=4):
-                            logger.info("Finding best boss...")
-                            find_btn_clicked = True
-                        continue
-                else:
-                    if self.appear(self.I_DE_BOSS) and (not find_btn_clicked):
-                        self.device.click_record_remove(self.I_DE_BOSS)
-                        if self.click(self.I_DE_BOSS, interval=4):
-                            logger.info("Finding normal boss...")
-                            find_btn_clicked = True
+                    self.screenshot()
+                    if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
+                        return True
+                    # 没找到boss但地图中央出现宝箱, 导致点击宝箱出现50勾玉购买界面(事后补救)
+                    if self.appear(self.I_JADE_50):
+                        self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
                         continue
                         continue
-            return True
+                    if not self.appear_then_click(search_button, interval=2):
+                        raise GameStuckError(f'Cannot find {boss_name} search button')
+                    logger.info(
+                        f'Finding {boss_name}, attempt {search_attempt}/2 '
+                        f'(re-enter round {reenter_round}/3)...'
+                    )
+                    time.sleep(1)
+
+                    # 每轮点击地图中央框选的红色“集结”区域至多两次,
+                    # 每次等待集结挑战标志5秒。
+                    for center_attempt in range(1, 3):
+                        self.click(self.C_DM_BOSS_CLICK, interval=2)
+                        deadline = time.monotonic() + 5
+                        while time.monotonic() < deadline:
+                            self.screenshot()
+                            if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
+                                logger.info(
+                                    f'{boss_name} gather appeared after center click '
+                                    f'{center_attempt}/2'
+                                )
+                                return True
+                            time.sleep(0.2)
+                        logger.warning(
+                            f'{boss_name} gather did not appear after center click '
+                            f'{center_attempt}/2'
+                        )
+
+                    # 本轮失败,返回逢魔地图,重新点击逢魔/极逢魔进行下一轮搜寻。
+                    self.screenshot()
+                    if self.appear(self.I_UI_BACK_RED):
+                        self.appear_then_click(self.I_UI_BACK_RED, interval=2)
+                        deadline = time.monotonic() + 5
+                        while time.monotonic() < deadline:
+                            self.screenshot()
+                            if self.appear(search_button):
+                                break
+                            time.sleep(0.2)
+
+                # 2次搜索都没找到: 重进地图清状态, 最多3轮
+                logger.info(f'Boss not found, re-enter demon encounter map (round {reenter_round}/3)')
+                self.goto_page(page_demon_encounter)
+                self.goto_page(page_demon_encounter_realworld)
+
+            raise GameStuckError(
+                f'Cannot enter {boss_name} after 3 re-enter rounds'
+            )
 
 
         def enter_boss():
         def enter_boss():
             logger.info('trying to enter boss...')
             logger.info('trying to enter boss...')
@@ -293,11 +330,13 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         :param index: 四个灯笼,从1开始
         :param index: 四个灯笼,从1开始
         :return:
         :return:
         """
         """
+        # 分类模板的搜索区(须容纳完整灯笼图案), 与点击区 C_DE_* 分离:
+        # 点击区只包住内部图形, 模板放不进搜索区会全部误判成 battle
         match_roi = {
         match_roi = {
-            1: self.C_DE_1.roi_front,
-            2: self.C_DE_2.roi_front,
-            3: self.C_DE_3.roi_front,
-            4: self.C_DE_4.roi_front,
+            1: self.C_DE_MATCH_1.roi_front,
+            2: self.C_DE_MATCH_2.roi_front,
+            3: self.C_DE_MATCH_3.roi_front,
+            4: self.C_DE_MATCH_4.roi_front,
         }
         }
         match_empty = {
         match_empty = {
             1: self.I_DE_DEFEAT_1,
             1: self.I_DE_DEFEAT_1,
@@ -422,9 +461,10 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                     break
                     break
                 # 如果没有出现红色关闭按钮,说明答题结束
                 # 如果没有出现红色关闭按钮,说明答题结束
                 if not self.appear(self.I_LETTER_CLOSE):
                 if not self.appear(self.I_LETTER_CLOSE):
-                    time.sleep(1.8)
+                    time.sleep(2.5)
                     self.screenshot()
                     self.screenshot()
                     if not self.appear(self.I_LETTER_CLOSE):
                     if not self.appear(self.I_LETTER_CLOSE):
+                        self.ui_reward_appear_click()
                         logger.warning('Answer finish')
                         logger.warning('Answer finish')
                         return
                         return