补充CreditFight和LastStageNavigation

mower/solvers/credit_fight.py

@@ -21,7 +21,7 @@ class CreditFight(SceneGraphSolver):
         logger.info("Start: 信用作战")
         self.support = False
         navi_solver = NavigationSolver()
-        navi_solver.run("OF-1")
+        navi_solver.run("OF-1", mode="copy")
         super().run()
 
     def choose_support(self):

mower/solvers/navigation/__init__.py

@@ -434,7 +434,8 @@ class NavigationSolver(SceneGraphSolver):
         """
         mode:默认为auto,抄作业为copy
         """
-        if LastStageNavigation().run(name):
+
+        if LastStageNavigation().run(name, mode):
             return True
         if name in ActivityNavigation.location:
             ActivityNavigation().run(name)
@@ -635,6 +636,10 @@ class NavigationSolver(SceneGraphSolver):
                         )
                         self.back()
                         return
+                if self.success:
+                    return True
+                else:
+                    self.back()
 
             elif self.mode == "copy":
                 if config.recog.gray[65][1333] < 200:
@@ -647,9 +652,8 @@ class NavigationSolver(SceneGraphSolver):
                     self.tap((1776, 908))
                     return
                 self.tap_element("ope_start", interval=2)
-            if self.success:
-                return True
-            else:
-                self.back()
+
+        elif scene == Scene.OPERATOR_SELECT and self.success:
+            return True
         else:
             self.scene_graph_step(Scene.TERMINAL_MAIN)

mower/solvers/navigation/last_stage.py

@@ -10,8 +10,9 @@ from .utils import last_letters
 
 
 class LastStageNavigation(SceneGraphSolver):
-    def run(self, name: str) -> None:
+    def run(self, name: str, mode: str) -> None:
         self.name = name
+        self.mode = mode
         self.success = True
         if self.name != "":
             self.scene_graph_navigation(Scene.TERMINAL_MAIN)
@@ -59,6 +60,21 @@ class LastStageNavigation(SceneGraphSolver):
                 self.success = False
                 return True
         elif scene == Scene.OPERATOR_BEFORE:
+            if self.mode == "auto":
+                return True
+            else:
+                if config.recog.gray[65][1333] < 200:
+                    self.sleep()
+                    return
+                # 取消代理作战
+                if config.recog.gray[907][1600] > 127 and not self.find(
+                    "ope_agency_lock"
+                ):
+                    self.tap((1776, 908))
+                    return
+                self.tap_element("ope_start", interval=2)
+        elif scene == Scene.OPERATOR_SELECT and self.mode == "copy":
             return True
+
         else:
             self.scene_graph_step(Scene.TERMINAL_MAIN)