From 1ea4cb5c7d84209032c4647014be33edf2de7dea Mon Sep 17 00:00:00 2001 From: Shawnsdaddy Date: Fri, 6 Sep 2024 01:50:47 -0700 Subject: [PATCH] fix formatting --- arknights_mower/__main__.py | 1 + arknights_mower/solvers/base_schedule.py | 6 +++--- arknights_mower/solvers/navigation.py | 1 - ui/src/pages/Log.vue | 27 ++++++++++++++++++------ 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/arknights_mower/__main__.py b/arknights_mower/__main__.py index 5dabaf70..8802b77e 100644 --- a/arknights_mower/__main__.py +++ b/arknights_mower/__main__.py @@ -1,5 +1,6 @@ import os from datetime import datetime, timedelta + from arknights_mower.solvers.base_schedule import BaseSchedulerSolver from arknights_mower.solvers.reclamation_algorithm import ReclamationAlgorithm from arknights_mower.solvers.secret_front import SecretFront diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index 2344f28b..05487307 100644 --- a/arknights_mower/solvers/base_schedule.py +++ b/arknights_mower/solvers/base_schedule.py @@ -28,7 +28,7 @@ from arknights_mower.utils.datetime import format_time, get_server_weekday from arknights_mower.utils.device.device import Device from arknights_mower.utils.digit_reader import DigitReader -from arknights_mower.utils.email import send_message, maa_template +from arknights_mower.utils.email import maa_template, send_message from arknights_mower.utils.graph import SceneGraphSolver from arknights_mower.utils.image import cropimg, loadres, thres2 from arknights_mower.utils.log import logger @@ -3253,7 +3253,7 @@ def maa_plan_solver(self, tasks="All", one_time=False): global stage_drop stage_drop = {"details": [], "summary": {}} - logger.info(f"MAA 启动") + logger.info("MAA 启动") hard_stop = False while self.MAA.running(): # 单次任务默认5分钟 @@ -3278,7 +3278,7 @@ def maa_plan_solver(self, tasks="All", one_time=False): if self.device.check_current_focus(): self.recog.update() elif not one_time: - logger.info(f"记录MAA 本次执行时间") + logger.info("记录MAA 本次执行时间") self.last_execution["maa"] = datetime.now() logger.info(self.last_execution["maa"]) if "Mall" in tasks and self.credit_fight is None: diff --git a/arknights_mower/solvers/navigation.py b/arknights_mower/solvers/navigation.py index 9454f0a3..1b5ccedd 100644 --- a/arknights_mower/solvers/navigation.py +++ b/arknights_mower/solvers/navigation.py @@ -3,7 +3,6 @@ import cv2 from arknights_mower.models import navigation -from arknights_mower.utils import hot_update from arknights_mower.utils.graph import SceneGraphSolver from arknights_mower.utils.image import thres2 from arknights_mower.utils.log import logger diff --git a/ui/src/pages/Log.vue b/ui/src/pages/Log.vue index 14f79f66..ad61f2f7 100644 --- a/ui/src/pages/Log.vue +++ b/ui/src/pages/Log.vue @@ -44,7 +44,7 @@ function start(value) { running.value = true log_lines.value = [] if (value == undefined) { - value = "0" + value = '0' } axios.get(`${import.meta.env.VITE_HTTP_URL}/start/${value}`) get_tasks() @@ -101,7 +101,6 @@ const start_options = [ key: '2' } ] - - +
@@ -149,7 +153,13 @@ const start_options = [ - +