diff --git a/gui.exe b/AUTO_MAA.exe similarity index 99% rename from gui.exe rename to AUTO_MAA.exe index 106345e..5f51638 100644 Binary files a/gui.exe and b/AUTO_MAA.exe differ diff --git a/gui.py b/AUTO_MAA.py similarity index 97% rename from gui.py rename to AUTO_MAA.py index 1860bec..3088bd4 100644 --- a/gui.py +++ b/AUTO_MAA.py @@ -365,6 +365,25 @@ class MaaRunner(QtCore.QThread): data["Configurations"]["Default"][ "Fight.UseExpiringMedicine" ] = "True" # 无限吃48小时内过期的理智药 + if self.data[uid][9] == "-": + data["Configurations"]["Default"][ + "Infrast.CustomInfrastEnabled" + ] = "False" # 禁用自定义基建配置 + else: + data["Configurations"]["Default"][ + "Infrast.CustomInfrastEnabled" + ] = "True" # 启用自定义基建配置 + data["Configurations"]["Default"][ + "Infrast.DefaultInfrast" + ] = "user_defined" # 内置配置 + data["Configurations"]["Default"][ + "Infrast.IsCustomInfrastFileReadOnly" + ] = "False" # 自定义基建配置文件只读 + data["Configurations"]["Default"][ + "Infrast.CustomInfrastFile" + ] = self.data[uid][ + 9 + ] # 自定义基建配置文件地址 with open(self.SetPath, "w", encoding="utf-8") as f: json.dump(data, f, indent=4) return True @@ -772,8 +791,7 @@ class Main(QWidget): item = QTableWidgetItem("今日已代理" + str(data[i][12]) + "次") item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) elif j == 9: - item = QTableWidgetItem(str(value)) - item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + item = QTableWidgetItem(str(value).replace("\\", "/")) elif j == 10: if self.PASSWORD == "": item = QTableWidgetItem("******") @@ -840,7 +858,7 @@ class Main(QWidget): "1-7", "-", "-", - "暂不支持", + "-", self.encryptx("未设置"), self.userlist.rowCount(), ), @@ -891,6 +909,8 @@ class Main(QWidget): games[gamein.strip()] = gameout.strip() if text in games: text = games[text] + if item.column() == 9: + text = text.replace("\\", "/") if item.column() == 10: text = self.encryptx(text) if text != "": diff --git a/gui/ui/main.ui b/gui/ui/main.ui index f68a6dc..207146e 100644 --- a/gui/ui/main.ui +++ b/gui/ui/main.ui @@ -932,9 +932,9 @@ li.checked::marker { content: "\2612"; } </style></head><body style=" font-family:'Microsoft YaHei UI'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">致用户：</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 这是AUTO_MAA_v3.0_Beta，项目初步完成可视化。</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 这是AUTO_MAA_v3.1，项目基本完成可视化。</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 这个版本可能出现各种各样的BUG，因此不会去除命令行窗口。当程序出现异常时，您可以在命令行窗口中获取报错信息，以便向项目组求助。</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 正式版去除了命令行窗口，但这不意味着BUG不会出现。由于用户与项目贡献者的稀缺，我们无法确保正式版足够完善，还望谅解。</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 您可以通过官方仓库 <a href="https://github.com/DLmaster361/AUTO_MAA/"><span style=" text-decoration: underline; color:#007ad6;">DLmaster361/AUTO_MAA</span></a> 发布Issues求助。</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> diff --git a/res/info.txt b/res/info.txt index 3c96bd1..f0d6abb 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, 0, 0, 0), + filevers=(3, 1, 0, 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.0'), + StringStruct('FileVersion', '3.1'), StringStruct('InternalName', 'AUTO_MAA'), StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'), StringStruct('OriginalFilename', 'AUTO_MAA'), StringStruct('ProductName', 'AUTO_MAA'), - StringStruct('ProductVersion', 'v3.0_Beta'), - StringStruct('Assembly Version', 'v3.0_Beta')]) + StringStruct('ProductVersion', 'v3.1'), + StringStruct('Assembly Version', 'v3.1')]) ]) ] ) \ No newline at end of file diff --git a/res/set.txt b/res/set.txt index c3ea1c1..0bd9d46 100644 --- a/res/set.txt +++ b/res/set.txt @@ -21,6 +21,11 @@ "Infrast.CustomInfrastPlanShowInFightSettings": "False" #显示基建计划 "Penguin.EnablePenguin": "True" #上报企鹅物流 "Yituliu.EnableYituliu": "True" #上报一图流 +#基建换班 +"Infrast.CustomInfrastEnabled": "True" #启用自定义基建配置 +"Infrast.DefaultInfrast": "user_defined" #内置配置 +"Infrast.IsCustomInfrastFileReadOnly": "False" #自定义基建配置文件只读 +"Infrast.CustomInfrastFile": "" #自定义基建配置文件地址 #设置 "Start.RunDirectly": "True" #启动MAA后直接运行 "Start.StartEmulator": "True" #启动MAA后自动开启模拟器 \ No newline at end of file diff --git a/toexe.py b/toexe.py index f6c787f..3d57ebd 100644 --- a/toexe.py +++ b/toexe.py @@ -20,4 +20,6 @@ import os -os.system("pyinstaller -F --version-file res/info.txt --icon=res/AUTO_MAA.ico gui.py") +os.system( + "pyinstaller -F --version-file res/info.txt -w --icon=res/AUTO_MAA.ico AUTO_MAA.py" +) diff --git a/更新说明.txt b/更新说明.txt index 1d72e1d..ca24d3c 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,3 +1,4 @@ 项目初始阶段，不会提供专门的版本更新程序，您需要手动更新程序。 -v3.0_Beta版本采用全新的架构，您需要手动输入之前的信息。 +v2.1.5及以前的用户，由于新版本采用全新的架构，您需要手动输入之前的信息。 +v3.0_Beta版用户，直接用AUTO_MAA.exe替代gui.exe后，重新设置每个用户的“自定义基建”选项（输入“-”以关闭该功能，输入自定义基建配置文件地址以开启该功能）。 新用户请忽略本说明。 \ No newline at end of file