From 6ee577302f940e1a378954127ce19d335c2f73b3 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Fri, 14 Mar 2025 23:59:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E4=BA=BA=E5=B7=A5=E6=8E=92?= =?UTF-8?q?=E6=9F=A5=E6=97=B6=E8=87=AA=E5=8A=A8=E5=B1=8F=E8=94=BD=E9=9D=99?= =?UTF-8?q?=E9=BB=98=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 1 + app/core/timer.py | 3 ++- app/models/MAA.py | 7 ++++++- resources/version.json | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index 9dcd8fd..57cd4e5 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -68,6 +68,7 @@ class AppConfig: self.PASSWORD = "" self.running_list = [] self.silence_list = [] + self.if_ignore_silence = False self.if_database_opened = False # 检查文件完整性 diff --git a/app/core/timer.py b/app/core/timer.py index 449ceba..99de8f9 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -84,7 +84,8 @@ class _MainTimer(QWidget): """设置静默模式""" if ( - Config.global_config.get(Config.global_config.function_IfSilence) + not Config.if_ignore_silence + and Config.global_config.get(Config.global_config.function_IfSilence) and Config.global_config.get(Config.global_config.function_BossKey) != "" ): diff --git a/app/models/MAA.py b/app/models/MAA.py index b242302..cd66a38 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -365,6 +365,9 @@ class MaaManager(QObject): # 人工排查模式 elif self.mode == "人工排查": + # 人工排查时，屏蔽静默操作 + Config.if_ignore_silence = True + # 标记是否需要启动模拟器 self.if_open_emulator = True # 标识排查模式 @@ -463,6 +466,9 @@ class MaaManager(QObject): self.update_user_list.emit(self.user_list) + # 解除静默操作屏蔽 + Config.if_ignore_silence = False + # 设置MAA模式 elif "设置MAA" in self.mode: @@ -572,7 +578,6 @@ class MaaManager(QObject): def __capture_response(self, response: bool) -> None: self.response = response - print(response) def refresh_maa_log(self) -> None: """刷新MAA日志""" diff --git a/resources/version.json b/resources/version.json index e00c5c6..e219ade 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,7 +1,7 @@ { - "main_version": "4.2.5.2", + "main_version": "4.2.5.3", "updater_version": "1.2.0.0", - "announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n## 程序优化\n- 关机等电源操作添加100s倒计时", + "announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作", "proxy_list": [ "", "https://gitproxy.click/",