automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(models): 简洁用户列表下相邻两个任务间的切换方式

Browse Source
This commit is contained in:
DLmaster
2025-02-12 22:06:04 +08:00
parent eb2f9d2cea
commit 7dc057e30f
7 changed files with 106 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/core/config.py
View File

@@ -488,6 +488,7 @@ class AppConfig:
self.maa_config.set(self.maa_config.MaaSet_Name, "") 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.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_ProxyTimesLimit, 0)
self.maa_config.set(self.maa_config.RunSet_AnnihilationTimeLimit, 40) self.maa_config.set(self.maa_config.RunSet_AnnihilationTimeLimit, 40)
self.maa_config.set(self.maa_config.RunSet_RoutineTimeLimit, 10) self.maa_config.set(self.maa_config.RunSet_RoutineTimeLimit, 10)
@@ -643,6 +644,12 @@ class MaaConfig(QConfig):
MaaSet_Name = ConfigItem("MaaSet", "Name", "") MaaSet_Name = ConfigItem("MaaSet", "Name", "")
MaaSet_Path = ConfigItem("MaaSet", "Path", ".", FolderValidator()) MaaSet_Path = ConfigItem("MaaSet", "Path", ".", FolderValidator())
RunSet_TaskTransitionMethod = OptionsConfigItem(
"RunSet",
"TaskTransitionMethod",
"ExitEmulator",
OptionsValidator(["NoAction", "ExitGame", "ExitEmulator"]),
)
RunSet_ProxyTimesLimit = RangeConfigItem( RunSet_ProxyTimesLimit = RangeConfigItem(
"RunSet", "ProxyTimesLimit", 0, RangeValidator(0, 1024) "RunSet", "ProxyTimesLimit", 0, RangeValidator(0, 1024)
) )

108
app/models/MAA.py
View File

@@ -117,25 +117,27 @@ class MaaManager(QObject):
if "设置MAA" not in self.mode: if "设置MAA" not in self.mode:
self.data = sorted(self.data, key=lambda x: (-len(x[15]), x[16])) 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] [_[0], "等待", index]
for index, _ in enumerate(self.data) for index, _ in enumerate(self.data)
if (_[3] != 0 and _[4] == "y") if (_[3] != 0 and _[4] == "y")
] ]
self.create_user_list.emit(user_list) self.create_user_list.emit(self.user_list)
# 自动代理模式 # 自动代理模式
if self.mode == "自动代理": if self.mode == "自动代理":
# 标记是否需要重启模拟器
self.if_open_emulator = True
# 执行情况预处理 # 执行情况预处理
for _ in user_list: for _ in self.user_list:
if self.data[_[2]][5] != curdate: if self.data[_[2]][5] != curdate:
self.data[_[2]][5] = curdate self.data[_[2]][5] = curdate
self.data[_[2]][14] = 0 self.data[_[2]][14] = 0
_[0] += f" - 第{self.data[_[2]][14] + 1}次代理" _[0] += f" - 第{self.data[_[2]][14] + 1}次代理"
# 开始代理 # 开始代理
for user in user_list: for user in self.user_list:
if self.isInterruptionRequested: if self.isInterruptionRequested:
break break
@@ -145,10 +147,10 @@ class MaaManager(QObject):
or self.data[user[2]][14] < self.set["RunSet"]["ProxyTimesLimit"] or self.data[user[2]][14] < self.set["RunSet"]["ProxyTimesLimit"]
): ):
user[1] = "运行" user[1] = "运行"
self.update_user_list.emit(user_list) self.update_user_list.emit(self.user_list)
else: else:
user[1] = "跳过" user[1] = "跳过"
self.update_user_list.emit(user_list) self.update_user_list.emit(self.user_list)
continue continue
# 初始化代理情况记录和模式替换记录 # 初始化代理情况记录和模式替换记录
@@ -177,6 +179,8 @@ class MaaManager(QObject):
if run_book[j]: if run_book[j]:
continue continue
if self.data[user[2]][15] == "beta":
self.if_open_emulator = True
# 配置MAA # 配置MAA
self.set_maa(mode_book[j], user[2]) self.set_maa(mode_book[j], user[2])
# 记录当前时间 # 记录当前时间
@@ -267,6 +271,7 @@ class MaaManager(QObject):
creationflags=subprocess.CREATE_NO_WINDOW, creationflags=subprocess.CREATE_NO_WINDOW,
) )
killprocess.wait() killprocess.wait()
self.if_open_emulator = True
# 推送异常通知 # 推送异常通知
Notify.push_notification( Notify.push_notification(
"用户自动代理出现异常！", "用户自动代理出现异常！",
@@ -301,28 +306,28 @@ class MaaManager(QObject):
if not (run_book[0] and run_book[1]): if not (run_book[0] and run_book[1]):
user[1] = "异常" user[1] = "异常"
self.update_user_list.emit(user_list) self.update_user_list.emit(self.user_list)
# 人工排查模式 # 人工排查模式
elif self.mode == "人工排查": elif self.mode == "人工排查":
# 标记是否需要启动模拟器 # 标记是否需要启动模拟器
if_strat_app = True self.if_open_emulator = True
# 标识排查模式 # 标识排查模式
for _ in user_list: for _ in self.user_list:
_[0] += "_排查模式" _[0] += "_排查模式"
# 开始排查 # 开始排查
for user in user_list: for user in self.user_list:
if self.isInterruptionRequested: if self.isInterruptionRequested:
break break
user[1] = "运行" 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 self.data[user[2]][15] == "beta":
if_strat_app = True self.if_open_emulator = True
run_book = [False for _ in range(2)] run_book = [False for _ in range(2)]
@@ -330,11 +335,7 @@ class MaaManager(QObject):
while not self.isInterruptionRequested: while not self.isInterruptionRequested:
# 配置MAA # 配置MAA
if if_strat_app: self.set_maa("人工排查", user[2])
self.set_maa("人工排查_启动模拟器", user[2])
if_strat_app = False
else:
self.set_maa("人工排查_仅切换账号", user[2])
# 记录当前时间 # 记录当前时间
start_time = datetime.now() start_time = datetime.now()
@@ -377,7 +378,7 @@ class MaaManager(QObject):
creationflags=subprocess.CREATE_NO_WINDOW, creationflags=subprocess.CREATE_NO_WINDOW,
) )
killprocess.wait() killprocess.wait()
if_strat_app = True self.if_open_emulator = True
for _ in range(10): for _ in range(10):
if self.isInterruptionRequested: if self.isInterruptionRequested:
break break
@@ -417,7 +418,7 @@ class MaaManager(QObject):
] = f"未通过人工排查|{self.data[user[2]][13]}" ] = f"未通过人工排查|{self.data[user[2]][13]}"
user[1] = "异常" user[1] = "异常"
self.update_user_list.emit(user_list) self.update_user_list.emit(self.user_list)
# 设置MAA模式 # 设置MAA模式
elif "设置MAA" in self.mode: elif "设置MAA" in self.mode:
@@ -472,17 +473,17 @@ class MaaManager(QObject):
killprocess.wait() killprocess.wait()
# 更新用户数据 # 更新用户数据
modes = [self.data[_[2]][15] for _ in user_list] modes = [self.data[_[2]][15] for _ in self.user_list]
uids = [self.data[_[2]][16] for _ in user_list] uids = [self.data[_[2]][16] for _ in self.user_list]
days = [self.data[_[2]][3] for _ in user_list] days = [self.data[_[2]][3] for _ in self.user_list]
lasts = [self.data[_[2]][5] for _ in user_list] lasts = [self.data[_[2]][5] for _ in self.user_list]
notes = [self.data[_[2]][13] for _ in user_list] notes = [self.data[_[2]][13] for _ in self.user_list]
numbs = [self.data[_[2]][14] for _ in user_list] numbs = [self.data[_[2]][14] for _ in self.user_list]
self.update_user_info.emit(modes, uids, days, lasts, notes, numbs) self.update_user_info.emit(modes, uids, days, lasts, notes, numbs)
error_index = [_[2] for _ in user_list if _[1] == "异常"] error_index = [_[2] for _ in self.user_list if _[1] == "异常"]
over_index = [_[2] for _ in user_list if _[1] == "完成"] over_index = [_[2] for _ in self.user_list if _[1] == "完成"]
wait_index = [_[2] for _ in 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") end_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -666,15 +667,34 @@ class MaaManager(QObject):
data["Current"] = "Default" # 切换配置 data["Current"] = "Default" # 切换配置
for i in range(1, 9): for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
data["Configurations"]["Default"][
"MainFunction.PostActions" if (
] = "12" # 完成后退出MAA和模拟器 [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"][ data["Configurations"]["Default"][
"Start.RunDirectly" "Start.RunDirectly"
] = "True" # 启动MAA后直接运行 ] = "True" # 启动MAA后直接运行
data["Configurations"]["Default"][ data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = (
"Start.OpenEmulatorAfterLaunch" "True" if self.if_open_emulator else "False"
] = "True" # 启动MAA后自动开启模拟器 ) # 启动MAA后自动开启模拟器
if Config.global_config.get(Config.global_config.function_IfSilence): if Config.global_config.get(Config.global_config.function_IfSilence):
data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化
@@ -887,7 +907,6 @@ class MaaManager(QObject):
"Start.RunDirectly" "Start.RunDirectly"
] = "True" # 启动MAA后直接运行 ] = "True" # 启动MAA后直接运行
data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化
# v5.1.12版本对以下字段处理
# 启动MAA后直接运行 # 启动MAA后直接运行
data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "True" data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "True"
# 启动MAA后自动开启模拟器 # 启动MAA后自动开启模拟器
@@ -895,15 +914,9 @@ class MaaManager(QObject):
data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标 data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标
data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘 data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘
# 启动MAA后自动开启模拟器 data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = (
if "启动模拟器" in mode: "True" if self.if_open_emulator else "False"
data["Configurations"]["Default"][ ) # 启动MAA后自动开启模拟器
"Start.OpenEmulatorAfterLaunch"
] = "True"
elif "仅切换账号" in mode:
data["Configurations"]["Default"][
"Start.OpenEmulatorAfterLaunch"
] = "False"
if self.data[index][15] == "simple": if self.data[index][15] == "simple":
@@ -1015,6 +1028,13 @@ class MaaManager(QObject):
"TaskQueue.Reclamation.IsChecked" "TaskQueue.Reclamation.IsChecked"
] = "False" # 生息演算 ] = "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: with self.maa_set_path.open(mode="w", encoding="utf-8") as f:
json.dump(data, f, ensure_ascii=False, indent=4) json.dump(data, f, ensure_ascii=False, indent=4)

24
app/services/system.py
View File

@@ -34,6 +34,7 @@ import win32process
import winreg import winreg
import psutil import psutil
import subprocess import subprocess
from pathlib import Path
from app.core import Config from app.core import Config
@@ -50,7 +51,7 @@ class _SystemHandler:
self.set_Sleep() self.set_Sleep()
self.set_SelfStart() self.set_SelfStart()
def set_Sleep(self): def set_Sleep(self) -> None:
"""同步系统休眠状态""" """同步系统休眠状态"""
if Config.global_config.get(Config.global_config.function_IfAllowSleep): if Config.global_config.get(Config.global_config.function_IfAllowSleep):
@@ -62,7 +63,7 @@ class _SystemHandler:
# 恢复系统电源状态 # 恢复系统电源状态
ctypes.windll.kernel32.SetThreadExecutionState(self.ES_CONTINUOUS) ctypes.windll.kernel32.SetThreadExecutionState(self.ES_CONTINUOUS)
def set_SelfStart(self): def set_SelfStart(self) -> None:
"""同步开机自启""" """同步开机自启"""
if ( if (
@@ -90,7 +91,7 @@ class _SystemHandler:
winreg.DeleteValue(key, "AUTO_MAA") winreg.DeleteValue(key, "AUTO_MAA")
winreg.CloseKey(key) winreg.CloseKey(key)
def set_power(self, mode): def set_power(self, mode) -> None:
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
@@ -144,7 +145,7 @@ class _SystemHandler:
self.main_window.close() self.main_window.close()
def is_startup(self): def is_startup(self) -> bool:
"""判断程序是否已经开机自启""" """判断程序是否已经开机自启"""
key = winreg.OpenKey( key = winreg.OpenKey(
@@ -162,7 +163,7 @@ class _SystemHandler:
winreg.CloseKey(key) winreg.CloseKey(key)
return False return False
def get_window_info(self): def get_window_info(self) -> list:
"""获取当前窗口信息""" """获取当前窗口信息"""
def callback(hwnd, window_info): def callback(hwnd, window_info):
@@ -176,5 +177,18 @@ class _SystemHandler:
win32gui.EnumWindows(callback, window_info) win32gui.EnumWindows(callback, window_info)
return 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() System = _SystemHandler()

5
app/ui/main_window.py
View File

@@ -26,10 +26,7 @@ v4.2
""" """
from loguru import logger from loguru import logger
from PySide6.QtWidgets import ( from PySide6.QtWidgets import QSystemTrayIcon
QApplication,
QSystemTrayIcon,
)
from qfluentwidgets import ( from qfluentwidgets import (
Action, Action,
PushButton, PushButton,

19
app/ui/member_manager.py
View File

@@ -46,6 +46,7 @@ from qfluentwidgets import (
HeaderCardWidget, HeaderCardWidget,
CommandBar, CommandBar,
ExpandGroupSettingCard, ExpandGroupSettingCard,
ComboBoxSettingCard,
PushSettingCard, PushSettingCard,
) )
from PySide6.QtCore import Qt from PySide6.QtCore import Qt
@@ -578,9 +579,13 @@ class MaaSettingBox(QWidget):
parent, parent,
) )
widget = QWidget() self.card_TaskTransitionMethod = ComboBoxSettingCard(
Layout = QVBoxLayout(widget) configItem=Config.maa_config.RunSet_TaskTransitionMethod,
icon=FluentIcon.PAGE_RIGHT,
title="任务切换方式",
content="简洁用户列表下相邻两个任务间的切换方式",
texts=["直接切换账号", "重启明日方舟", "重启模拟器"],
)
self.ProxyTimesLimit = SpinBoxSettingCard( self.ProxyTimesLimit = SpinBoxSettingCard(
(0, 1024), (0, 1024),
FluentIcon.PAGE_RIGHT, FluentIcon.PAGE_RIGHT,
@@ -588,7 +593,6 @@ class MaaSettingBox(QWidget):
"当用户本日代理成功次数超过该阈值时跳过代理，阈值为“0”时视为无代理次数上限", "当用户本日代理成功次数超过该阈值时跳过代理，阈值为“0”时视为无代理次数上限",
Config.maa_config.RunSet_ProxyTimesLimit, Config.maa_config.RunSet_ProxyTimesLimit,
) )
self.AnnihilationTimeLimit = SpinBoxSettingCard( self.AnnihilationTimeLimit = SpinBoxSettingCard(
(1, 1024), (1, 1024),
FluentIcon.PAGE_RIGHT, FluentIcon.PAGE_RIGHT,
@@ -596,7 +600,6 @@ class MaaSettingBox(QWidget):
"MAA日志无变化时间超过该阈值视为超时，单位为分钟", "MAA日志无变化时间超过该阈值视为超时，单位为分钟",
Config.maa_config.RunSet_AnnihilationTimeLimit, Config.maa_config.RunSet_AnnihilationTimeLimit,
) )
self.RoutineTimeLimit = SpinBoxSettingCard( self.RoutineTimeLimit = SpinBoxSettingCard(
(1, 1024), (1, 1024),
FluentIcon.PAGE_RIGHT, FluentIcon.PAGE_RIGHT,
@@ -604,7 +607,6 @@ class MaaSettingBox(QWidget):
"MAA日志无变化时间超过该阈值视为超时，单位为分钟", "MAA日志无变化时间超过该阈值视为超时，单位为分钟",
Config.maa_config.RunSet_RoutineTimeLimit, Config.maa_config.RunSet_RoutineTimeLimit,
) )
self.RunTimesLimit = SpinBoxSettingCard( self.RunTimesLimit = SpinBoxSettingCard(
(1, 1024), (1, 1024),
FluentIcon.PAGE_RIGHT, FluentIcon.PAGE_RIGHT,
@@ -613,14 +615,15 @@ class MaaSettingBox(QWidget):
Config.maa_config.RunSet_RunTimesLimit, Config.maa_config.RunSet_RunTimesLimit,
) )
widget = QWidget()
Layout = QVBoxLayout(widget)
Layout.addWidget(self.card_TaskTransitionMethod)
Layout.addWidget(self.ProxyTimesLimit) Layout.addWidget(self.ProxyTimesLimit)
Layout.addWidget(self.AnnihilationTimeLimit) Layout.addWidget(self.AnnihilationTimeLimit)
Layout.addWidget(self.RoutineTimeLimit) Layout.addWidget(self.RoutineTimeLimit)
Layout.addWidget(self.RunTimesLimit) Layout.addWidget(self.RunTimesLimit)
self.viewLayout.setContentsMargins(0, 0, 0, 0) self.viewLayout.setContentsMargins(0, 0, 0, 0)
self.viewLayout.setSpacing(0) self.viewLayout.setSpacing(0)
self.addGroupWidget(widget) self.addGroupWidget(widget)
class UserSettingCard(HeaderCardWidget): class UserSettingCard(HeaderCardWidget):

4
resources/docs/MAA_config_info.txt
View File

@@ -1,5 +1,7 @@
#主界面 #主界面
"MainFunction.PostActions": "12" #完成后 "MainFunction.PostActions": "8" #完成后退出MAA
"MainFunction.PostActions": "9" #完成后退出MAA和游戏
"MainFunction.PostActions": "12" #完成后退出MAA和模拟器
"TaskQueue.WakeUp.IsChecked": "True" #开始唤醒 "TaskQueue.WakeUp.IsChecked": "True" #开始唤醒
"TaskQueue.Recruiting.IsChecked": "True" #自动公招 "TaskQueue.Recruiting.IsChecked": "True" #自动公招
"TaskQueue.Base.IsChecked": "True" #基建换班 "TaskQueue.Base.IsChecked": "True" #基建换班

2
resources/version.json
View File

@@ -1,7 +1,7 @@
{ {
"main_version": "4.2.3.1", "main_version": "4.2.3.1",
"updater_version": "1.1.1.3", "updater_version": "1.1.1.3",
"announcement": "\n## 新增功能\n- 暂无\n## 修复BUG\n- 修复静默代理标记移除异常情况\n## 程序优化\n- 暂无", "announcement": "\n## 新增功能\n- 添加`简洁用户列表下相邻两个任务间的切换方式`可选项\n## 修复BUG\n- 修复静默代理标记移除异常情况\n## 程序优化\n- 暂无",
"proxy_list": [ "proxy_list": [
"", "",
"https://gitproxy.click/", "https://gitproxy.click/",