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

fix(core): 修正更新器方法；取消MAA运行中自动更新；补充MAA监测字段

Browse Source
This commit is contained in:
DLmaster
2025-02-18 16:17:03 +08:00
parent 85f3d6f09f
commit 2768faed53
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/MAA.py
View File

@@ -580,6 +580,7 @@ class MaaManager(QObject):
self.maa_result = "Success!" self.maa_result = "Success!"
elif ( elif (
("请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log) ("请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log)
or ("未检测到任何模拟器" in log)
or ("已停止" in log) or ("已停止" in log)
or ("MaaAssistantArknights GUI exited" in log) or ("MaaAssistantArknights GUI exited" in log)
): ):
@@ -596,6 +597,7 @@ class MaaManager(QObject):
self.maa_result = "Success!" self.maa_result = "Success!"
elif ( elif (
("请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log) ("请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log)
or ("未检测到任何模拟器" in log)
or ("已停止" in log) or ("已停止" in log)
or ("MaaAssistantArknights GUI exited" in log) or ("MaaAssistantArknights GUI exited" in log)
): ):
@@ -734,13 +736,13 @@ class MaaManager(QObject):
data["Global"][ data["Global"][
"VersionUpdate.ScheduledUpdateCheck" "VersionUpdate.ScheduledUpdateCheck"
] = "True" # 定时检查更新 ] = "False" # 定时检查更新
data["Global"][ data["Global"][
"VersionUpdate.AutoDownloadUpdatePackage" "VersionUpdate.AutoDownloadUpdatePackage"
] = "True" # 自动下载更新包 ] = "False" # 自动下载更新包
data["Global"][ data["Global"][
"VersionUpdate.AutoInstallUpdatePackage" "VersionUpdate.AutoInstallUpdatePackage"
] = "True" # 自动安装更新包 ] = "False" # 自动安装更新包
data["Configurations"]["Default"]["Start.ClientType"] = self.data[ data["Configurations"]["Default"]["Start.ClientType"] = self.data[
index index
][ ][

2
app/ui/member_manager.py
View File

@@ -330,7 +330,7 @@ class MemberManager(QWidget):
for _ in range(3): for _ in range(3):
try: try:
response = requests.get( response = requests.get(
"https://mirrorc.top/api/resources/MAA/latest?user_agent=MaaWpfGui&os=win&arch=x64&channel=beta" "https://mirrorc.top/api/resources/MAA/latest?user_agent=MaaWpfGui&os=win&arch=x64&channel=stable"
) )
maa_info = response.json() maa_info = response.json()
break break

4
resources/version.json
View File

@@ -1,7 +1,7 @@
{ {
"main_version": "4.2.4.0", "main_version": "4.2.4.1",
"updater_version": "1.1.2.0", "updater_version": "1.1.2.0",
"announcement": "\n## 新增功能\n- 添加`简洁用户列表下相邻两个任务间的切换方式`可选项\n- 恢复启动后直接运行主任务功能以及相关托盘菜单\n## 修复BUG\n- 修复静默代理标记移除异常情况\n- 适配深色模式 #18\n## 程序优化\n- 优化MAA关闭方法\n- 添加高级代理文件校验过程\n- 升级日志监看方法\n- 优化主调度台默认选项\n- 配置MAA前关闭可能未正常退出的MAA进程\n- 接入镜像源", "announcement": "\n## 新增功能\n- 暂无\n## 修复BUG\n- 更新器修正`channel`\n## 程序优化\n- 添加MAA监测字段：`未检测到任何模拟器`\n- 取消MAA运行中自动更新",
"proxy_list": [ "proxy_list": [
"", "",
"https://gitproxy.click/", "https://gitproxy.click/",