فهرست منبع

fix(Exploration): #529

huangrunheng 2 سال پیش
والد
کامیت
74b7b652be
2فایلهای تغییر یافته به همراه17 افزوده شده و 9 حذف شده
  1. 5 0
      tasks/Exploration/base.py
  2. 12 9
      tasks/Exploration/solo.py

+ 5 - 0
tasks/Exploration/base.py

@@ -23,6 +23,7 @@ from tasks.Utils.config_enum import ShikigamiClass
 from module.logger import logger
 from module.exception import RequestHumanTakeover, TaskEnd
 from module.atom.image_grid import ImageGrid
+from module.atom.animate import RuleAnimate
 from module.base.utils import load_image
 
 class Scene(Enum):
@@ -51,6 +52,10 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
         )
         return self.config.model.exploration
 
+    @cached_property
+    def _match_end(self):
+        return RuleAnimate(self.I_SWIPE_END)
+
     def get_current_scene(self, reuse_screenshot: bool = True) -> Scene:
         if not reuse_screenshot:
             self.screenshot()

+ 12 - 9
tasks/Exploration/solo.py

@@ -7,10 +7,10 @@ from cached_property import cached_property
 from module.logger import logger
 from module.base.timer import Timer
 
-
 from tasks.Component.GeneralInvite.config_invite import InviteConfig, InviteNumber, FindMode
 from tasks.Exploration.base import BaseExploration, UpType, Scene
-from tasks.Exploration.config import ChooseRarity, AutoRotate, UserStatus
+from tasks.Exploration.config import ChooseRarity, AutoRotate, UserStatus, ExplorationLevel
+
 
 class SoloExploration(BaseExploration):
     INVITE_FLAG_OFF = (157, 109, 83)
@@ -80,7 +80,7 @@ class SoloExploration(BaseExploration):
                 # 向后拉,寻找怪
                 if search_fail_cnt >= 4:
                     search_fail_cnt = 0
-                    if self.appear(self.I_SWIPE_END):
+                    if (self._config.exploration_config.exploration_level == ExplorationLevel.EXPLORATION_28 and self.appear(self.I_SWIPE_END)) or self._match_end.stable(self.device.image):
                         self.quit_explore()
                         continue
                     if self.swipe(self.S_SWIPE_BACKGROUND_RIGHT, interval=3):
@@ -210,7 +210,7 @@ class SoloExploration(BaseExploration):
                 # 向后拉,寻找怪
                 if search_fail_cnt >= 4:
                     search_fail_cnt = 0
-                    if self.appear(self.I_SWIPE_END):
+                    if (self._config.exploration_config.exploration_level == ExplorationLevel.EXPLORATION_28 and self.appear(self.I_SWIPE_END)) or self._match_end.stable(self.device.image):
                         self.quit_explore()
                         continue
                     if self.swipe(self.S_SWIPE_BACKGROUND_RIGHT, interval=4.5):
@@ -443,10 +443,14 @@ class ScriptTask(SoloExploration):
             self.pre_process()
 
         match self._config.exploration_config.user_status:
-            case UserStatus.ALONE: self.run_solo()
-            case UserStatus.LEADER: self.run_leader()
-            case UserStatus.MEMBER: self.run_member()
-            case _: self.run_solo()
+            case UserStatus.ALONE:
+                self.run_solo()
+            case UserStatus.LEADER:
+                self.run_leader()
+            case UserStatus.MEMBER:
+                self.run_member()
+            case _:
+                self.run_solo()
 
         self.post_process()
 
@@ -459,4 +463,3 @@ if __name__ == "__main__":
     device = Device(config)
     t = ScriptTask(config, device)
     t.run()
-