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

Merge branch 'user_edit_dev' into dev

Browse Source
This commit is contained in:
DLmaster
2025-01-27 23:18:34 +08:00
parent 0a411c150a 9983455b60
commit f0d272cce5
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/MAA.py
View File

@@ -684,9 +684,11 @@ class MaaManager(QObject):
] # 客户端类型 ] # 客户端类型
# 账号切换 # 账号切换
if self.data[index][2] == "Official": if self.data[index][2] == "Official":
data["Configurations"]["Default"][ data["Configurations"]["Default"]["Start.AccountName"] = (
"Start.AccountName" f"{self.data[index][1][:3]}****{self.data[index][1][7:]}"
] = f"{self.data[index][1][:3]}****{self.data[index][1][7:]}" if len(self.data[index][1]) == 11
else self.data[index][1]
)
elif self.data[index][2] == "Bilibili": elif self.data[index][2] == "Bilibili":
data["Configurations"]["Default"]["Start.AccountName"] = self.data[ data["Configurations"]["Default"]["Start.AccountName"] = self.data[
index index
@@ -903,9 +905,11 @@ class MaaManager(QObject):
] # 客户端类型 ] # 客户端类型
# 账号切换 # 账号切换
if self.data[index][2] == "Official": if self.data[index][2] == "Official":
data["Configurations"]["Default"][ data["Configurations"]["Default"]["Start.AccountName"] = (
"Start.AccountName" f"{self.data[index][1][:3]}****{self.data[index][1][7:]}"
] = f"{self.data[index][1][:3]}****{self.data[index][1][7:]}" if len(self.data[index][1]) == 11
else self.data[index][1]
)
elif self.data[index][2] == "Bilibili": elif self.data[index][2] == "Bilibili":
data["Configurations"]["Default"]["Start.AccountName"] = self.data[ data["Configurations"]["Default"]["Start.AccountName"] = self.data[
index index

4
resources/docs/MAA_config_info.txt
View File

@@ -8,8 +8,6 @@
"TaskQueue.Mall.IsChecked": "True" #获取信用及购物 "TaskQueue.Mall.IsChecked": "True" #获取信用及购物
"TaskQueue.AutoRoguelike.IsChecked": "False" #自动肉鸽 "TaskQueue.AutoRoguelike.IsChecked": "False" #自动肉鸽
"TaskQueue.Reclamation.IsChecked": "False" #生息演算 "TaskQueue.Reclamation.IsChecked": "False" #生息演算
"Start.RunDirectly": "True" #启动MAA后直接运行
"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器
#刷理智 #刷理智
"MainFunction.Stage1": "" #主关卡 "MainFunction.Stage1": "" #主关卡
"MainFunction.Stage2": "" #备选关卡1 "MainFunction.Stage2": "" #备选关卡1
@@ -40,6 +38,8 @@ G"VersionUpdate.ScheduledUpdateCheck": "True" #定时检查更新
G"VersionUpdate.AutoDownloadUpdatePackage": "True" #自动下载更新包 G"VersionUpdate.AutoDownloadUpdatePackage": "True" #自动下载更新包
G"VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包 G"VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包
G"Start.MinimizeDirectly": "True" #启动MAA后直接最小化 G"Start.MinimizeDirectly": "True" #启动MAA后直接最小化
"Start.RunDirectly": "True" #启动MAA后直接运行
"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器
G"GUI.UseTray": "True" #显示托盘图标 G"GUI.UseTray": "True" #显示托盘图标
G"GUI.MinimizeToTray": "False" #最小化时隐藏至托盘 G"GUI.MinimizeToTray": "False" #最小化时隐藏至托盘
"Start.EmulatorPath" #模拟器路径 "Start.EmulatorPath" #模拟器路径