fix(maa): 静默模式控制时段延长至模拟器完成启动的10s后
This commit is contained in:
@@ -576,7 +576,7 @@ class MaaPlanConfig(LQConfig):
|
||||
|
||||
class AppConfig(GlobalConfig):
|
||||
|
||||
VERSION = "4.3.10.3"
|
||||
VERSION = "4.3.10.0"
|
||||
|
||||
gameid_refreshed = Signal()
|
||||
PASSWORD_refreshed = Signal()
|
||||
|
||||
@@ -96,17 +96,9 @@ class _MainTimer(QObject):
|
||||
|
||||
windows = System.get_window_info()
|
||||
|
||||
# 排除雷电名为新通知的窗口
|
||||
windows = [
|
||||
window
|
||||
for window in windows
|
||||
if not (
|
||||
window[0] == "新通知" and Path(window[1]) in Config.silence_list
|
||||
)
|
||||
]
|
||||
|
||||
# 此处排除雷电名为新通知的窗口
|
||||
if any(
|
||||
str(emulator_path) in window
|
||||
str(emulator_path) in window and window[0] != "新通知"
|
||||
for window in windows
|
||||
for emulator_path in Config.silence_list
|
||||
):
|
||||
|
||||
@@ -32,6 +32,7 @@ import subprocess
|
||||
import shutil
|
||||
import re
|
||||
import win32com.client
|
||||
from functools import partial
|
||||
from datetime import datetime, timedelta
|
||||
from pathlib import Path
|
||||
from jinja2 import Environment, FileSystemLoader
|
||||
@@ -959,8 +960,10 @@ class MaaManager(QObject):
|
||||
if self.isInterruptionRequested:
|
||||
return None
|
||||
|
||||
# 移除静默进程标记
|
||||
Config.silence_list.remove(self.emulator_path)
|
||||
# 10s后移除静默进程标记
|
||||
QTimer.singleShot(
|
||||
10000, partial(Config.silence_list.remove, self.emulator_path)
|
||||
)
|
||||
|
||||
if "-" in self.ADB_address:
|
||||
ADB_ip = f"{self.ADB_address.split("-")[0]}-"
|
||||
|
||||
Reference in New Issue
Block a user