From 7dc057e30f1841c688c4370950b7abbfddf49276 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Wed, 12 Feb 2025 22:06:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(models):=20=E7=AE=80=E6=B4=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E4=B8=8B=E7=9B=B8=E9=82=BB=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E4=BB=BB=E5=8A=A1=E9=97=B4=E7=9A=84=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 7 ++ app/models/MAA.py | 108 +++++++++++++++++------------ app/services/system.py | 24 +++++-- app/ui/main_window.py | 5 +- app/ui/member_manager.py | 19 ++--- resources/docs/MAA_config_info.txt | 4 +- resources/version.json | 2 +- 7 files changed, 106 insertions(+), 63 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index f0bee3f..02febe3 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -488,6 +488,7 @@ class AppConfig: self.maa_config.set(self.maa_config.MaaSet_Name, "") self.maa_config.set(self.maa_config.MaaSet_Path, ".") + self.maa_config.set(self.maa_config.RunSet_TaskTransitionMethod, "ExitEmulator") self.maa_config.set(self.maa_config.RunSet_ProxyTimesLimit, 0) self.maa_config.set(self.maa_config.RunSet_AnnihilationTimeLimit, 40) self.maa_config.set(self.maa_config.RunSet_RoutineTimeLimit, 10) @@ -643,6 +644,12 @@ class MaaConfig(QConfig): MaaSet_Name = ConfigItem("MaaSet", "Name", "") MaaSet_Path = ConfigItem("MaaSet", "Path", ".", FolderValidator()) + RunSet_TaskTransitionMethod = OptionsConfigItem( + "RunSet", + "TaskTransitionMethod", + "ExitEmulator", + OptionsValidator(["NoAction", "ExitGame", "ExitEmulator"]), + ) RunSet_ProxyTimesLimit = RangeConfigItem( "RunSet", "ProxyTimesLimit", 0, RangeValidator(0, 1024) ) diff --git a/app/models/MAA.py b/app/models/MAA.py index 13d8d9e..cb23665 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -117,25 +117,27 @@ class MaaManager(QObject): if "设置MAA" not in self.mode: self.data = sorted(self.data, key=lambda x: (-len(x[15]), x[16])) - user_list: List[List[str, str, int]] = [ + self.user_list: List[List[str, str, int]] = [ [_[0], "等待", index] for index, _ in enumerate(self.data) if (_[3] != 0 and _[4] == "y") ] - self.create_user_list.emit(user_list) + self.create_user_list.emit(self.user_list) # 自动代理模式 if self.mode == "自动代理": + # 标记是否需要重启模拟器 + self.if_open_emulator = True # 执行情况预处理 - for _ in user_list: + for _ in self.user_list: if self.data[_[2]][5] != curdate: self.data[_[2]][5] = curdate self.data[_[2]][14] = 0 _[0] += f" - 第{self.data[_[2]][14] + 1}次代理" # 开始代理 - for user in user_list: + for user in self.user_list: if self.isInterruptionRequested: break @@ -145,10 +147,10 @@ class MaaManager(QObject): or self.data[user[2]][14] < self.set["RunSet"]["ProxyTimesLimit"] ): user[1] = "运行" - self.update_user_list.emit(user_list) + self.update_user_list.emit(self.user_list) else: user[1] = "跳过" - self.update_user_list.emit(user_list) + self.update_user_list.emit(self.user_list) continue # 初始化代理情况记录和模式替换记录 @@ -177,6 +179,8 @@ class MaaManager(QObject): if run_book[j]: continue + if self.data[user[2]][15] == "beta": + self.if_open_emulator = True # 配置MAA self.set_maa(mode_book[j], user[2]) # 记录当前时间 @@ -267,6 +271,7 @@ class MaaManager(QObject): creationflags=subprocess.CREATE_NO_WINDOW, ) killprocess.wait() + self.if_open_emulator = True # 推送异常通知 Notify.push_notification( "用户自动代理出现异常！", @@ -301,28 +306,28 @@ class MaaManager(QObject): if not (run_book[0] and run_book[1]): user[1] = "异常" - self.update_user_list.emit(user_list) + self.update_user_list.emit(self.user_list) # 人工排查模式 elif self.mode == "人工排查": # 标记是否需要启动模拟器 - if_strat_app = True + self.if_open_emulator = True # 标识排查模式 - for _ in user_list: + for _ in self.user_list: _[0] += "_排查模式" # 开始排查 - for user in user_list: + for user in self.user_list: if self.isInterruptionRequested: break user[1] = "运行" - self.update_user_list.emit(user_list) + self.update_user_list.emit(self.user_list) if self.data[user[2]][15] == "beta": - if_strat_app = True + self.if_open_emulator = True run_book = [False for _ in range(2)] @@ -330,11 +335,7 @@ class MaaManager(QObject): while not self.isInterruptionRequested: # 配置MAA - if if_strat_app: - self.set_maa("人工排查_启动模拟器", user[2]) - if_strat_app = False - else: - self.set_maa("人工排查_仅切换账号", user[2]) + self.set_maa("人工排查", user[2]) # 记录当前时间 start_time = datetime.now() @@ -377,7 +378,7 @@ class MaaManager(QObject): creationflags=subprocess.CREATE_NO_WINDOW, ) killprocess.wait() - if_strat_app = True + self.if_open_emulator = True for _ in range(10): if self.isInterruptionRequested: break @@ -417,7 +418,7 @@ class MaaManager(QObject): ] = f"未通过人工排查|{self.data[user[2]][13]}" user[1] = "异常" - self.update_user_list.emit(user_list) + self.update_user_list.emit(self.user_list) # 设置MAA模式 elif "设置MAA" in self.mode: @@ -472,17 +473,17 @@ class MaaManager(QObject): killprocess.wait() # 更新用户数据 - modes = [self.data[_[2]][15] for _ in user_list] - uids = [self.data[_[2]][16] for _ in user_list] - days = [self.data[_[2]][3] for _ in user_list] - lasts = [self.data[_[2]][5] for _ in user_list] - notes = [self.data[_[2]][13] for _ in user_list] - numbs = [self.data[_[2]][14] for _ in user_list] + modes = [self.data[_[2]][15] for _ in self.user_list] + uids = [self.data[_[2]][16] for _ in self.user_list] + days = [self.data[_[2]][3] for _ in self.user_list] + lasts = [self.data[_[2]][5] for _ in self.user_list] + notes = [self.data[_[2]][13] for _ in self.user_list] + numbs = [self.data[_[2]][14] for _ in self.user_list] self.update_user_info.emit(modes, uids, days, lasts, notes, numbs) - error_index = [_[2] for _ in user_list if _[1] == "异常"] - over_index = [_[2] for _ in user_list if _[1] == "完成"] - wait_index = [_[2] for _ in user_list if _[1] == "等待"] + error_index = [_[2] for _ in self.user_list if _[1] == "异常"] + over_index = [_[2] for _ in self.user_list if _[1] == "完成"] + wait_index = [_[2] for _ in self.user_list if _[1] == "等待"] # 保存运行日志 end_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") @@ -666,15 +667,34 @@ class MaaManager(QObject): data["Current"] = "Default" # 切换配置 for i in range(1, 9): data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 - data["Configurations"]["Default"][ - "MainFunction.PostActions" - ] = "12" # 完成后退出MAA和模拟器 + + if ( + [i for i, _ in enumerate(self.user_list) if _[2] == index][0] + == len(self.user_list) - 1 + ) or ( + self.data[ + self.user_list[ + [i for i, _ in enumerate(self.user_list) if _[2] == index][0] + + 1 + ][2] + ][15] + == "beta" + ): + data["Configurations"]["Default"][ + "MainFunction.PostActions" + ] = "12" # 完成后退出MAA和模拟器 + else: + method_dict = {"NoAction": "8", "ExitGame": "9", "ExitEmulator": "12"} + data["Configurations"]["Default"]["MainFunction.PostActions"] = ( + method_dict[self.set["RunSet"]["TaskTransitionMethod"]] + ) # 完成后行为 + data["Configurations"]["Default"][ "Start.RunDirectly" ] = "True" # 启动MAA后直接运行 - data["Configurations"]["Default"][ - "Start.OpenEmulatorAfterLaunch" - ] = "True" # 启动MAA后自动开启模拟器 + data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = ( + "True" if self.if_open_emulator else "False" + ) # 启动MAA后自动开启模拟器 if Config.global_config.get(Config.global_config.function_IfSilence): data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 @@ -887,7 +907,6 @@ class MaaManager(QObject): "Start.RunDirectly" ] = "True" # 启动MAA后直接运行 data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 - # v5.1.12版本对以下字段处理 # 启动MAA后直接运行 data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "True" # 启动MAA后自动开启模拟器 @@ -895,15 +914,9 @@ class MaaManager(QObject): data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标 data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘 - # 启动MAA后自动开启模拟器 - if "启动模拟器" in mode: - data["Configurations"]["Default"][ - "Start.OpenEmulatorAfterLaunch" - ] = "True" - elif "仅切换账号" in mode: - data["Configurations"]["Default"][ - "Start.OpenEmulatorAfterLaunch" - ] = "False" + data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = ( + "True" if self.if_open_emulator else "False" + ) # 启动MAA后自动开启模拟器 if self.data[index][15] == "simple": @@ -1015,6 +1028,13 @@ class MaaManager(QObject): "TaskQueue.Reclamation.IsChecked" ] = "False" # 生息演算 + # 启动模拟器仅生效一次 + if ( + self.if_open_emulator + and self.set["RunSet"]["TaskTransitionMethod"] != "ExitEmulator" + ): + self.if_open_emulator = False + # 覆写配置文件 with self.maa_set_path.open(mode="w", encoding="utf-8") as f: json.dump(data, f, ensure_ascii=False, indent=4) diff --git a/app/services/system.py b/app/services/system.py index b2939d2..5ff3e6d 100644 --- a/app/services/system.py +++ b/app/services/system.py @@ -34,6 +34,7 @@ import win32process import winreg import psutil import subprocess +from pathlib import Path from app.core import Config @@ -50,7 +51,7 @@ class _SystemHandler: self.set_Sleep() self.set_SelfStart() - def set_Sleep(self): + def set_Sleep(self) -> None: """同步系统休眠状态""" if Config.global_config.get(Config.global_config.function_IfAllowSleep): @@ -62,7 +63,7 @@ class _SystemHandler: # 恢复系统电源状态 ctypes.windll.kernel32.SetThreadExecutionState(self.ES_CONTINUOUS) - def set_SelfStart(self): + def set_SelfStart(self) -> None: """同步开机自启""" if ( @@ -90,7 +91,7 @@ class _SystemHandler: winreg.DeleteValue(key, "AUTO_MAA") winreg.CloseKey(key) - def set_power(self, mode): + def set_power(self, mode) -> None: if sys.platform.startswith("win"): @@ -144,7 +145,7 @@ class _SystemHandler: self.main_window.close() - def is_startup(self): + def is_startup(self) -> bool: """判断程序是否已经开机自启""" key = winreg.OpenKey( @@ -162,7 +163,7 @@ class _SystemHandler: winreg.CloseKey(key) return False - def get_window_info(self): + def get_window_info(self) -> list: """获取当前窗口信息""" def callback(hwnd, window_info): @@ -176,5 +177,18 @@ class _SystemHandler: win32gui.EnumWindows(callback, window_info) return window_info + def search_pids(path: Path) -> list: + """根据路径查找进程PID""" + + pids = [] + for proc in psutil.process_iter(["pid", "exe"]): + try: + if proc.info["exe"] and proc.info["exe"].lower() == str(path).lower(): + pids.append(proc.info["pid"]) + except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess): + # 进程可能在此期间已结束或无法访问，忽略这些异常 + pass + return pids + System = _SystemHandler() diff --git a/app/ui/main_window.py b/app/ui/main_window.py index 28e99e9..3893002 100644 --- a/app/ui/main_window.py +++ b/app/ui/main_window.py @@ -26,10 +26,7 @@ v4.2 """ from loguru import logger -from PySide6.QtWidgets import ( - QApplication, - QSystemTrayIcon, -) +from PySide6.QtWidgets import QSystemTrayIcon from qfluentwidgets import ( Action, PushButton, diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index ec7bfe6..55d2090 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -46,6 +46,7 @@ from qfluentwidgets import ( HeaderCardWidget, CommandBar, ExpandGroupSettingCard, + ComboBoxSettingCard, PushSettingCard, ) from PySide6.QtCore import Qt @@ -578,9 +579,13 @@ class MaaSettingBox(QWidget): parent, ) - widget = QWidget() - Layout = QVBoxLayout(widget) - + self.card_TaskTransitionMethod = ComboBoxSettingCard( + configItem=Config.maa_config.RunSet_TaskTransitionMethod, + icon=FluentIcon.PAGE_RIGHT, + title="任务切换方式", + content="简洁用户列表下相邻两个任务间的切换方式", + texts=["直接切换账号", "重启明日方舟", "重启模拟器"], + ) self.ProxyTimesLimit = SpinBoxSettingCard( (0, 1024), FluentIcon.PAGE_RIGHT, @@ -588,7 +593,6 @@ class MaaSettingBox(QWidget): "当用户本日代理成功次数超过该阈值时跳过代理，阈值为“0”时视为无代理次数上限", Config.maa_config.RunSet_ProxyTimesLimit, ) - self.AnnihilationTimeLimit = SpinBoxSettingCard( (1, 1024), FluentIcon.PAGE_RIGHT, @@ -596,7 +600,6 @@ class MaaSettingBox(QWidget): "MAA日志无变化时间超过该阈值视为超时，单位为分钟", Config.maa_config.RunSet_AnnihilationTimeLimit, ) - self.RoutineTimeLimit = SpinBoxSettingCard( (1, 1024), FluentIcon.PAGE_RIGHT, @@ -604,7 +607,6 @@ class MaaSettingBox(QWidget): "MAA日志无变化时间超过该阈值视为超时，单位为分钟", Config.maa_config.RunSet_RoutineTimeLimit, ) - self.RunTimesLimit = SpinBoxSettingCard( (1, 1024), FluentIcon.PAGE_RIGHT, @@ -613,14 +615,15 @@ class MaaSettingBox(QWidget): Config.maa_config.RunSet_RunTimesLimit, ) + widget = QWidget() + Layout = QVBoxLayout(widget) + Layout.addWidget(self.card_TaskTransitionMethod) Layout.addWidget(self.ProxyTimesLimit) Layout.addWidget(self.AnnihilationTimeLimit) Layout.addWidget(self.RoutineTimeLimit) Layout.addWidget(self.RunTimesLimit) - self.viewLayout.setContentsMargins(0, 0, 0, 0) self.viewLayout.setSpacing(0) - self.addGroupWidget(widget) class UserSettingCard(HeaderCardWidget): diff --git a/resources/docs/MAA_config_info.txt b/resources/docs/MAA_config_info.txt index 7e813bb..d5e5a1c 100644 --- a/resources/docs/MAA_config_info.txt +++ b/resources/docs/MAA_config_info.txt @@ -1,5 +1,7 @@ #主界面 -"MainFunction.PostActions": "12" #完成后 +"MainFunction.PostActions": "8" #完成后退出MAA +"MainFunction.PostActions": "9" #完成后退出MAA和游戏 +"MainFunction.PostActions": "12" #完成后退出MAA和模拟器 "TaskQueue.WakeUp.IsChecked": "True" #开始唤醒 "TaskQueue.Recruiting.IsChecked": "True" #自动公招 "TaskQueue.Base.IsChecked": "True" #基建换班 diff --git a/resources/version.json b/resources/version.json index 7164fe2..51af90d 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,7 +1,7 @@ { "main_version": "4.2.3.1", "updater_version": "1.1.1.3", - "announcement": "\n## 新增功能\n- 暂无\n## 修复BUG\n- 修复静默代理标记移除异常情况\n## 程序优化\n- 暂无", + "announcement": "\n## 新增功能\n- 添加`简洁用户列表下相邻两个任务间的切换方式`可选项\n## 修复BUG\n- 修复静默代理标记移除异常情况\n## 程序优化\n- 暂无", "proxy_list": [ "", "https://gitproxy.click/",