为跑单前返回首页添加选项

ArkMowers · Jan 5, 2024 · ce7071d · ce7071d
1 parent 177debd
commit ce7071d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/arknights_mower/__main__.py b/arknights_mower/__main__.py
@@ -48,6 +48,7 @@ def main(c, p, o={}, child_conn=None):
     )  # 服务器
     config.TAP_TO_LAUNCH = conf["tap_to_launch_game"]
     config.fix_mumu12_adb_disconnect = conf["fix_mumu12_adb_disconnect"]
+    config.grandet_back_to_index = conf["run_order_grandet_mode"]["back_to_index"]
     init_fhlr(child_conn)
     Pipe.conn = child_conn
     logger.info("开始运行Mower")

diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py
@@ -30,6 +30,7 @@
 from arknights_mower.utils.news import get_update_time
 from arknights_mower.utils import rapidocr
 from arknights_mower.utils.simulator import restart_simulator
+from arknights_mower.utils import config
 import cv2
 
 from ctypes import CFUNCTYPE, c_int, c_char_p, c_void_p
@@ -435,8 +436,8 @@ def infra_main(self):
                     get_time = False
                     if TaskTypes.SHIFT_OFF == self.task.type:
                         get_time = True
-                    if TaskTypes.RUN_ORDER == self.task.type and not self.refresh_connecting and self.op_data.config.run_order_buffer_time > 0:
-                        logger.info("退回主界面以确保跑单前的登录状态")
+                    if config.grandet_back_to_index and TaskTypes.RUN_ORDER == self.task.type and not self.refresh_connecting and self.op_data.config.run_order_buffer_time > 0:
+                        logger.info("跑单前返回主界面以保持登录状态")
                         self.back_to_index()
                         self.refresh_connecting = True
                         return

diff --git a/arknights_mower/templates/conf.yml b/arknights_mower/templates/conf.yml
@@ -256,6 +256,7 @@ sss:
 run_order_grandet_mode:
   enable: true
   buffer_time: 30
+  back_to_index: false
 server_push_enable: false
 sendKey: ''
 recruit_gap: 9

diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue
@@ -259,6 +259,11 @@ import { render_op_label, render_op_tag } from '@/utils/op_select'
               </template>
               <n-input-number v-model:value="run_order_grandet_mode.buffer_time" />
             </n-form-item>
+            <n-form-item v-if="run_order_grandet_mode.enable" :show-label="false">
+              <n-checkbox v-model:checked="run_order_grandet_mode.back_to_index">
+                跑单前返回主界面以保持登录状态
+              </n-checkbox>
+            </n-form-item>
             <n-form-item>
               <template #label>
                 <span>无人机使用房间</span>