首页进入终端适配主题；延长保全导航点击间隔

ArkMowers · Nov 1, 2023 · 40b9493 · 40b9493
1 parent 6ba050d
commit 40b9493
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/arknights_mower/resources/index_terminal_dark.png b/arknights_mower/resources/index_terminal_dark.png
diff --git a/arknights_mower/resources/index_terminal_ep13.png b/arknights_mower/resources/index_terminal_ep13.png
diff --git a/arknights_mower/resources/index_terminal_sami.png b/arknights_mower/resources/index_terminal_sami.png
diff --git a/arknights_mower/solvers/operation.py b/arknights_mower/solvers/operation.py
@@ -89,7 +89,7 @@ def transition(self) -> bool:
             return True
 
         if self.scene() == Scene.INDEX:
-            self.tap_element('index_terminal')
+            self.tap_themed_element('index_terminal')
         elif self.scene() == Scene.TERMINAL_MAIN:
             return self.terminal_main()
         elif self.scene() == Scene.OPERATOR_BEFORE:

diff --git a/arknights_mower/utils/solver.py b/arknights_mower/utils/solver.py
@@ -357,17 +357,17 @@ def back_to_reclamation_algorithm(self):
                 self.device.exit('com.hypergryph.arknights')
             self.back_to_index()
         logger.info('导航至生息演算')
-        self.tap_element('index_terminal', 0.5)
+        self.tap_themed_element('index_terminal')
         self.tap((self.recog.w * 0.2, self.recog.h * 0.8), interval=0.5)
 
     def to_sss(self, sss_type, ec_type=3):
         self.recog.update()
         # 导航去保全派驻
         retry = 0
         self.back_to_index()
-        self.tap_element('index_terminal', 0.5)
-        self.tap((self.recog.w * 0.7, self.recog.h * 0.95), interval=0.2)
-        self.tap((self.recog.w * 0.85, self.recog.h * 0.5), interval=0.2)
+        self.tap_themed_element('index_terminal')
+        self.tap((self.recog.w * 0.7, self.recog.h * 0.95)) # 常态事务
+        self.tap((self.recog.w * 0.85, self.recog.h * 0.5)) # 保全
         if sss_type == 1:
             self.tap((self.recog.w * 0.2, self.recog.h * 0.3), interval=5)
         else:
@@ -381,13 +381,14 @@ def to_sss(self, sss_type, ec_type=3):
                 logger.info("选择小队")
             elif self.find('choose_ss_ec') is not None and not choose_team:
                 if ec_type == 1:
-                    self.tap((self.recog.w * 0.3, self.recog.h * 0.5), interval=0.2)
+                    self.tap((self.recog.w * 0.3, self.recog.h * 0.5))
                 elif ec_type == 2:
-                    self.tap((self.recog.w * 0.5, self.recog.h * 0.5), interval=0.2)
+                    self.tap((self.recog.w * 0.5, self.recog.h * 0.5))
                 else:
-                    self.tap((self.recog.w * 0.7, self.recog.h * 0.5), interval=0.2)
+                    self.tap((self.recog.w * 0.7, self.recog.h * 0.5))
                 ec_chosen_step = loop_count
                 logger.info(f"选定导能单元:{ec_type}")
+            # 开始保全作战
             self.tap((self.recog.w * 0.95, self.recog.h * 0.95), interval=(0.2 if not choose_team else 10))
             self.recog.update()
             loop_count += 1