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

Merge branch 'dev' into ClozyA_dev

Browse Source
This commit is contained in:
aoxuan
2025-05-19 00:18:37 +08:00
parent 0d904b229e 0b06b499e4
commit 3787c25a77
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/MAA.py
View File

@@ -907,7 +907,7 @@ class MaaManager(QObject):
if "-" in self.ADB_address: if "-" in self.ADB_address:
ADB_ip = f"{self.ADB_address.split("-")[0]}-" ADB_ip = f"{self.ADB_address.split("-")[0]}-"
ADB_port = self.ADB_address.split("-")[1] ADB_port = int(self.ADB_address.split("-")[1])
elif ":" in self.ADB_address: elif ":" in self.ADB_address:
ADB_ip = f"{self.ADB_address.split(':')[0]}:" ADB_ip = f"{self.ADB_address.split(':')[0]}:"
@@ -1398,7 +1398,9 @@ class MaaManager(QObject):
] = "True" # 备选关卡 ] = "True" # 备选关卡
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Fight.UseRemainingSanityStage" "Fight.UseRemainingSanityStage"
] = "True" # 使用剩余理智 ] = (
"True" if user_data["Info"]["GameId_Remain"] != "-" else "False"
) # 使用剩余理智
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Fight.UseExpiringMedicine" "Fight.UseExpiringMedicine"
] = "True" # 无限吃48小时内过期的理智药 ] = "True" # 无限吃48小时内过期的理智药
@@ -1496,7 +1498,9 @@ class MaaManager(QObject):
] = "True" # 备选关卡 ] = "True" # 备选关卡
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Fight.UseRemainingSanityStage" "Fight.UseRemainingSanityStage"
] = "True" # 使用剩余理智 ] = (
"True" if user_data["Info"]["GameId_Remain"] != "-" else "False"
) # 使用剩余理智
# 基建模式 # 基建模式
if ( if (
@@ -1597,6 +1601,15 @@ class MaaManager(QObject):
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Start.OpenEmulatorAfterLaunch" "Start.OpenEmulatorAfterLaunch"
] = "False" # 启动MAA后自动开启模拟器 ] = "False" # 启动MAA后自动开启模拟器
data["Global"][
"VersionUpdate.ScheduledUpdateCheck"
] = "False" # 定时检查更新
data["Global"][
"VersionUpdate.AutoDownloadUpdatePackage"
] = "False" # 自动下载更新包
data["Global"][
"VersionUpdate.AutoInstallUpdatePackage"
] = "False" # 自动安装更新包
if Config.get(Config.function_IfSilence): if Config.get(Config.function_IfSilence):
data["Global"][ data["Global"][
@@ -1605,15 +1618,6 @@ class MaaManager(QObject):
if "全局" in mode: if "全局" in mode:
data["Global"][
"VersionUpdate.ScheduledUpdateCheck"
] = "False" # 定时检查更新
data["Global"][
"VersionUpdate.AutoDownloadUpdatePackage"
] = "False" # 自动下载更新包
data["Global"][
"VersionUpdate.AutoInstallUpdatePackage"
] = "False" # 自动安装更新包
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"TaskQueue.WakeUp.IsChecked" "TaskQueue.WakeUp.IsChecked"
] = "False" # 开始唤醒 ] = "False" # 开始唤醒

3
resources/version.json
View File

@@ -4,6 +4,9 @@
"4.3.8.3": { "4.3.8.3": {
"新增功能": [ "新增功能": [
"用户仪表盘支持直接控制用户状态" "用户仪表盘支持直接控制用户状态"
],
"修复bug": [
"修复雷电ADB端口号相关问题"
] ]
}, },
"4.3.8.2": { "4.3.8.2": {