diff --git a/AUTO_MAA.exe b/AUTO_MAA.exe index 75481db..ed9ef15 100644 Binary files a/AUTO_MAA.exe and b/AUTO_MAA.exe differ diff --git a/AUTO_MAA.py b/AUTO_MAA.py index 6627768..7d7cded 100644 --- a/AUTO_MAA.py +++ b/AUTO_MAA.py @@ -263,8 +263,8 @@ class MaaRunner(QtCore.QThread): data = json.load(f) if s == 0: data["Configurations"]["Default"][ - "MainFunction.ActionAfterCompleted" - ] = "ExitEmulatorAndSelf" # 完成后退出MAA和模拟器 + "MainFunction.PostActions" + ] = "12" # 完成后退出MAA和模拟器 data["Configurations"]["Default"][ "Start.RunDirectly" ] = "True" # 启动MAA后直接运行 @@ -341,46 +341,53 @@ class MaaRunner(QtCore.QThread): data["Configurations"]["Default"][ "TaskQueue.Mall.IsChecked" ] = "True" # 获取信用及购物 - data["Configurations"]["Default"]["MainFunction.Stage1"] = self.data[uid][ - 5 - ] # 主关卡 - data["Configurations"]["Default"]["MainFunction.Stage2"] = self.data[uid][ - 6 - ] # 备选关卡1 - data["Configurations"]["Default"]["MainFunction.Stage3"] = self.data[uid][ - 7 - ] # 备选关卡2 + # 主关卡 + if self.data[uid][5] == "-": + data["Configurations"]["Default"]["MainFunction.Stage1"] = "" + else: + data["Configurations"]["Default"]["MainFunction.Stage1"] = self.data[ + uid + ][5] + # 备选关卡1 + if self.data[uid][6] == "-": + data["Configurations"]["Default"]["MainFunction.Stage2"] = "" + else: + data["Configurations"]["Default"]["MainFunction.Stage2"] = self.data[ + uid + ][6] + # 备选关卡2 + if self.data[uid][7] == "-": + data["Configurations"]["Default"]["MainFunction.Stage3"] = "" + else: + data["Configurations"]["Default"]["MainFunction.Stage3"] = self.data[ + uid + ][7] data["Configurations"]["Default"][ "Fight.RemainingSanityStage" ] = "" # 剩余理智关卡 + # 连战次数 if self.data[uid][5] == "1-7": - data["Configurations"]["Default"][ - "MainFunction.Series.Quantity" - ] = "6" # 连战次数 + data["Configurations"]["Default"]["MainFunction.Series.Quantity"] = "6" else: - data["Configurations"]["Default"][ - "MainFunction.Series.Quantity" - ] = "1" # 连战次数 + data["Configurations"]["Default"]["MainFunction.Series.Quantity"] = "1" data["Configurations"]["Default"][ "Penguin.IsDrGrandet" ] = "False" # 博朗台模式 data["Configurations"]["Default"][ "GUI.CustomStageCode" ] = "True" # 手动输入关卡名 + # 备选关卡 if self.data[uid][6] == "-" and self.data[uid][7] == "-": - data["Configurations"]["Default"][ - "GUI.UseAlternateStage" - ] = "False" # 不使用备选关卡 + data["Configurations"]["Default"]["GUI.UseAlternateStage"] = "False" else: - data["Configurations"]["Default"][ - "GUI.UseAlternateStage" - ] = "True" # 使用备选关卡 + data["Configurations"]["Default"]["GUI.UseAlternateStage"] = "True" data["Configurations"]["Default"][ "Fight.UseRemainingSanityStage" ] = "False" # 使用剩余理智 data["Configurations"]["Default"][ "Fight.UseExpiringMedicine" ] = "True" # 无限吃48小时内过期的理智药 + # 自定义基建配置 if self.data[uid][9] == "-": data["Configurations"]["Default"][ "Infrast.CustomInfrastEnabled" diff --git a/res/info.txt b/res/info.txt index 7cab613..581e426 100644 --- a/res/info.txt +++ b/res/info.txt @@ -4,7 +4,7 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(3, 1, 1, 0), + filevers=(3, 1, 2, 0), prodvers=(0, 0, 0, 0), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, @@ -31,13 +31,13 @@ VSVersionInfo( [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'), StringStruct('CompanyName', 'AUTO_MAA Team'), StringStruct('FileDescription', 'AUTO_MAA Component'), - StringStruct('FileVersion', '3.1.1'), + StringStruct('FileVersion', '3.1.2'), StringStruct('InternalName', 'AUTO_MAA'), StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'), StringStruct('OriginalFilename', 'AUTO_MAA.py'), StringStruct('ProductName', 'AUTO_MAA'), - StringStruct('ProductVersion', 'v3.1.1'), - StringStruct('Assembly Version', 'v3.1.1')]) + StringStruct('ProductVersion', 'v3.1.2'), + StringStruct('Assembly Version', 'v3.1.2')]) ]) ] ) \ No newline at end of file diff --git a/res/set.txt b/res/set.txt index 0bd9d46..bab00a1 100644 --- a/res/set.txt +++ b/res/set.txt @@ -1,5 +1,6 @@ #主界面 -"MainFunction.ActionAfterCompleted": "ExitEmulatorAndSelf" #完成后 +"MainFunction.ActionAfterCompleted": "ExitEmulatorAndSelf" #完成后(旧) +"MainFunction.PostActions": "12" #完成后(新) "TaskQueue.WakeUp.IsChecked": "True" #开始唤醒 "TaskQueue.Recruiting.IsChecked": "True" #自动公招 "TaskQueue.Base.IsChecked": "True" #基建换班 diff --git a/更新说明.txt b/更新说明.txt index f368ed1..3770331 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,5 +1,5 @@ 项目初始阶段,不会提供专门的版本更新程序,您需要手动更新程序。 v2.1.5及以前的用户,由于新版本采用全新的架构,您需要手动输入之前的信息。 v3.0_Beta版用户,直接用AUTO_MAA.exe替代gui.exe后,将原文件夹下的gui文件夹用新版本对应文件替换,重新设置每个用户的“自定义基建”选项(输入“-”以关闭该功能,输入自定义基建配置文件地址以开启该功能)。 -v3.1版用户,将原文件夹下的AUTO_MAA.exe文件和gui文件夹用新版本对应文件替换即可。 +v3.1~v3.1.1版用户,将原文件夹下的AUTO_MAA.exe文件和gui文件夹用新版本对应文件替换即可。 新用户请忽略本说明。 \ No newline at end of file