Răsfoiți Sursa

perf(Exploration): 按UP类型自适应滑屏找怪策略与死代码精简

- 特定UP模式(经验/金币/达摩):启用2次滑屏早退策略(MAX_SWIPE_COUNT = 2),覆盖前3屏无怪即早退重开

- 全部模式(UpType.ALL):不限制滑屏次数,支持滑至最右边缘以打完全部小怪并击杀首领

- 剔除失效的巡航常量与 current_swipe_interval 死代码,清理废弃的 _match_end.refresh()

- 缓存滑屏位移判定,避免单次检测内重复计算图像差分与输出日志

- 成员化 search_fail_timer,消除 17 处冗余参数透传
Vanity 1 lună în urmă
părinte
comite
69a0fc4f24
1 a modificat fișierele cu 73 adăugiri și 48 ștergeri
  1. 73 48
      tasks/Exploration/solo.py

+ 73 - 48
tasks/Exploration/solo.py

@@ -18,7 +18,11 @@ class SoloExploration(BaseExploration):
     INVITE_FLAG_ON = (227, 193, 153)
     INVITE_TIMEOUT = 20
     FRIEND_LEAVE_TIMEOUT = 3
+    SEARCH_SWIPE_INTERVAL = 1.5
+    MAX_SWIPE_COUNT = 2
     explore_init = False
+    swipe_cnt: int = 0
+    search_fail_timer: Timer = None
 
     @cached_property
     def _invite_config(self) -> InviteConfig:
@@ -60,48 +64,65 @@ class SoloExploration(BaseExploration):
         self.quit_explore()
         return True
 
-    def _reset_search_state(self, search_fail_timer: Timer) -> int:
-        search_fail_timer.clear()
-        self._match_end.refresh()
-        return 0
-
-    def _search_next_area(self, search_fail_timer: Timer, unchanged_swipe_cnt: int) -> int:
-        if not search_fail_timer.started():
-            search_fail_timer.start()
-            return unchanged_swipe_cnt
-        if not search_fail_timer.reached():
-            return unchanged_swipe_cnt
+    def _reset_search_state(self, reset_swipe_cnt: bool = False) -> None:
+        if reset_swipe_cnt:
+            if self.swipe_cnt > 0:
+                logger.info(f"Exploration search reset (cleared count: {self.swipe_cnt})")
+            self.swipe_cnt = 0
+        self.search_fail_timer.clear()
+
+    def _search_next_area(self) -> None:
+        if not self.search_fail_timer.started():
+            self.search_fail_timer.start()
+            return
+        if not self.search_fail_timer.reached():
+            return
+
+        # 若选择特定 UP(如经验怪),达到最大滑屏次数(默认2次,覆盖前3屏高密度区)超时仍无目标直接早退重开;
+        # 若选择“全部”,则不限次数滑动直到最右边界,以保证清完全图小怪并击杀 BOSS。
+        is_specific_up = self._config.exploration_config.up_type != UpType.ALL
+        if is_specific_up and self.swipe_cnt >= self.MAX_SWIPE_COUNT:
+            logger.info(f"Max search swipe count ({self.MAX_SWIPE_COUNT}) reached for specific UP target. Quitting exploration early.")
+            self._reset_search_state(reset_swipe_cnt=True)
+            self.quit_explore()
+            return
 
         before_image = self.device.image
         self.swipe(self.S_SWIPE_BACKGROUND_RIGHT)
         sleep(0.3)
         self.screenshot()
-        if self.is_swipe_unchanged(before_image, self.device.image):
+        unchanged = self.is_swipe_unchanged(before_image, self.device.image)
+        if unchanged:
             sleep(0.3)
             self.screenshot()
+            unchanged = self.is_swipe_unchanged(before_image, self.device.image)
+
         if (self.get_current_scene() != Scene.MAIN
                 or self.appear(self.I_UI_CONFIRM)
                 or self.appear(self.I_UI_CONFIRM_SAMLL)):
-            search_fail_timer.reset()
-            return 0
+            self.search_fail_timer.reset()
+            return
 
-        if self.is_swipe_unchanged(before_image, self.device.image):
-            unchanged_swipe_cnt += 1
-            if unchanged_swipe_cnt >= 2:
-                search_fail_timer.clear()
+        # 若未产生位移,原地做快速二次复核保底
+        if unchanged:
+            sleep(0.3)
+            before_retry = self.device.image
+            self.swipe(self.S_SWIPE_BACKGROUND_RIGHT)
+            sleep(0.3)
+            self.screenshot()
+            if self.is_swipe_unchanged(before_retry, self.device.image):
+                logger.info("Reached rightmost boundary (confirmed twice). Quitting exploration.")
+                self._reset_search_state(reset_swipe_cnt=True)
                 self.quit_explore()
-                return 0
-        else:
-            unchanged_swipe_cnt = 0
-            self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
+                return
 
-        search_fail_timer.reset()
-        return unchanged_swipe_cnt
+        self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
+        self.swipe_cnt += 1
+        self.search_fail_timer.reset()
 
     def run_solo(self):
         logger.hr('solo')
-        search_fail_timer = Timer(1.0)
-        unchanged_swipe_cnt = 0
+        self.search_fail_timer = Timer(self.SEARCH_SWIPE_INTERVAL)
 
         while 1:
             self.screenshot()
@@ -109,7 +130,8 @@ class SoloExploration(BaseExploration):
             logger.info(f'[run_solo] Current scene: {scene.name}')  # TODO 2026.06.22 之后删掉这个刷屏的
             #
             if scene == Scene.WORLD:
-                unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                self.explore_init = False
+                self._reset_search_state(reset_swipe_cnt=True)
                 self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                 # 打开右边箭头
                 if not self.wait_world_stable():
@@ -120,7 +142,8 @@ class SoloExploration(BaseExploration):
                 continue
             #
             elif scene == Scene.ENTRANCE:
-                unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                self.explore_init = False
+                self._reset_search_state(reset_swipe_cnt=True)
                 self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                 if self.check_exit():
                     break
@@ -133,23 +156,23 @@ class SoloExploration(BaseExploration):
                         self.enter_settings_and_do_operations()
                     self.ui_click(self.I_E_AUTO_ROTATE_OFF, stop=self.I_E_AUTO_ROTATE_ON, timeout=5)
                     self.explore_init = True
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state(reset_swipe_cnt=True)
                     continue
                 if self._handle_treasure_box():
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     continue
                 if (self.appear_then_click(self.I_UI_CONFIRM, interval=1)
                         or self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1)):
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     continue
                 # 小纸人
                 if self.appear(self.I_BATTLE_REWARD):
                     if self.ui_get_reward(self.I_BATTLE_REWARD):
-                        unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                        self._reset_search_state()
                         continue
                 # boss
                 if self.appear(self.I_BOSS_BATTLE_BUTTON):
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                     if self.fire(self.I_BOSS_BATTLE_BUTTON):
                         logger.info(f'Boss battle, minions cnt {self.minions_cnt}')
@@ -157,13 +180,13 @@ class SoloExploration(BaseExploration):
                 # 小怪
                 fight_button = self.search_up_fight()
                 if fight_button is not None:
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                     if self.fire(fight_button):
                         logger.info(f'Fight, minions cnt {self.minions_cnt}')
                     continue
                 # 向后拉,寻找怪
-                unchanged_swipe_cnt = self._search_next_area(search_fail_timer, unchanged_swipe_cnt)
+                self._search_next_area()
                 continue
             #
             elif scene == Scene.BATTLE_PREPARE or scene == Scene.BATTLE_FIGHTING:
@@ -173,8 +196,7 @@ class SoloExploration(BaseExploration):
 
     def run_leader(self):
         logger.hr('leader')
-        search_fail_timer = Timer(1.0)
-        unchanged_swipe_cnt = 0
+        self.search_fail_timer = Timer(self.SEARCH_SWIPE_INTERVAL)
         friend_leave_timer = Timer(self.FRIEND_LEAVE_TIMEOUT)
 
         while 1:
@@ -182,7 +204,8 @@ class SoloExploration(BaseExploration):
             scene = self.get_current_scene()
             # 探索大世界
             if scene == Scene.WORLD:
-                unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                self.explore_init = False
+                self._reset_search_state(reset_swipe_cnt=True)
                 self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                 # 打开右边箭头
                 if not self.wait_world_stable():
@@ -202,7 +225,8 @@ class SoloExploration(BaseExploration):
 
             # 邀请好友, 非常有可能是后面邀请好友,然后直接跳到组队了
             elif scene == Scene.ENTRANCE:
-                unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                self.explore_init = False
+                self._reset_search_state(reset_swipe_cnt=True)
                 self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                 while 1:
                     self.screenshot()
@@ -219,7 +243,8 @@ class SoloExploration(BaseExploration):
                         continue
             #
             elif scene == Scene.TEAM:
-                unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                self.explore_init = False
+                self._reset_search_state(reset_swipe_cnt=True)
                 self.wait_until_stable(self.I_ADD_2, timer=Timer(0.8, 1))
                 if self.appear(self.I_FIRE, threshold=0.8) and not self.appear(self.I_ADD_2):
                     self.ui_click_until_disappear(self.I_FIRE, interval=1)
@@ -246,27 +271,27 @@ class SoloExploration(BaseExploration):
                         self.enter_settings_and_do_operations()
                     self.ui_click(self.I_E_AUTO_ROTATE_OFF, stop=self.I_E_AUTO_ROTATE_ON)
                     self.explore_init = True
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state(reset_swipe_cnt=True)
                     continue
                 if self._handle_treasure_box():
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     continue
                 if (self.appear_then_click(self.I_UI_CONFIRM, interval=1)
                         or self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1)):
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     continue
                 # 小纸人
                 if self.appear(self.I_BATTLE_REWARD):
                     if self.ui_get_reward(self.I_BATTLE_REWARD):
-                        unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                        self._reset_search_state()
                         continue
                 # 中途有人跑路
                 if self._check_mate_leave(friend_leave_timer):
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     continue
                 # boss
                 if self.appear(self.I_BOSS_BATTLE_BUTTON):
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                     if self.fire(self.I_BOSS_BATTLE_BUTTON):
                         logger.info(f'Boss battle, minions cnt {self.minions_cnt}')
@@ -274,13 +299,13 @@ class SoloExploration(BaseExploration):
                 # 小怪
                 fight_button = self.search_up_fight()
                 if fight_button is not None:
-                    unchanged_swipe_cnt = self._reset_search_state(search_fail_timer)
+                    self._reset_search_state()
                     self.device.click_record_remove(self.S_SWIPE_BACKGROUND_RIGHT.name)
                     if self.fire(fight_button):
                         logger.info(f'Fight, minions cnt {self.minions_cnt}')
                     continue
                 # 向后拉,寻找怪
-                unchanged_swipe_cnt = self._search_next_area(search_fail_timer, unchanged_swipe_cnt)
+                self._search_next_area()
                 continue
             #
             elif scene == Scene.BATTLE_PREPARE or scene == Scene.BATTLE_FIGHTING: