From 9983455b60788d5550e3e5296ba115ba91a77fb0 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Mon, 27 Jan 2025 23:10:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(maa):=20=E4=BF=AE=E5=A4=8D=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=A0=81=E4=B8=8D=E5=85=A8=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E6=B7=B7=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 16 ++++++++++------ resources/docs/MAA_config_info.txt | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index 1380f2b..c25328b 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -684,9 +684,11 @@ class MaaManager(QObject): ] # 客户端类型 # 账号切换 if self.data[index][2] == "Official": - data["Configurations"]["Default"][ - "Start.AccountName" - ] = f"{self.data[index][1][:3]}****{self.data[index][1][7:]}" + data["Configurations"]["Default"]["Start.AccountName"] = ( + 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": data["Configurations"]["Default"]["Start.AccountName"] = self.data[ index @@ -903,9 +905,11 @@ class MaaManager(QObject): ] # 客户端类型 # 账号切换 if self.data[index][2] == "Official": - data["Configurations"]["Default"][ - "Start.AccountName" - ] = f"{self.data[index][1][:3]}****{self.data[index][1][7:]}" + data["Configurations"]["Default"]["Start.AccountName"] = ( + 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": data["Configurations"]["Default"]["Start.AccountName"] = self.data[ index diff --git a/resources/docs/MAA_config_info.txt b/resources/docs/MAA_config_info.txt index b0a40fb..7e813bb 100644 --- a/resources/docs/MAA_config_info.txt +++ b/resources/docs/MAA_config_info.txt @@ -8,8 +8,6 @@ "TaskQueue.Mall.IsChecked": "True" #获取信用及购物 "TaskQueue.AutoRoguelike.IsChecked": "False" #自动肉鸽 "TaskQueue.Reclamation.IsChecked": "False" #生息演算 -"Start.RunDirectly": "True" #启动MAA后直接运行 -"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器 #刷理智 "MainFunction.Stage1": "" #主关卡 "MainFunction.Stage2": "" #备选关卡1 @@ -40,6 +38,8 @@ G"VersionUpdate.ScheduledUpdateCheck": "True" #定时检查更新 G"VersionUpdate.AutoDownloadUpdatePackage": "True" #自动下载更新包 G"VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包 G"Start.MinimizeDirectly": "True" #启动MAA后直接最小化 +"Start.RunDirectly": "True" #启动MAA后直接运行 +"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器 G"GUI.UseTray": "True" #显示托盘图标 G"GUI.MinimizeToTray": "False" #最小化时隐藏至托盘 "Start.EmulatorPath" #模拟器路径 \ No newline at end of file