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

添加对自定义基建的支持

Browse Source
This commit is contained in:
DLmaster
2024-07-17 16:19:38 +08:00
parent ce1534657b
commit 5b98c58926
7 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gui.exe → AUTO_MAA.exe
View File

Binary file not shown.

26
gui.py → AUTO_MAA.py
View File

@@ -365,6 +365,25 @@ class MaaRunner(QtCore.QThread):
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Fight.UseExpiringMedicine" "Fight.UseExpiringMedicine"
] = "True" # 无限吃48小时内过期的理智药 ] = "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: with open(self.SetPath, "w", encoding="utf-8") as f:
json.dump(data, f, indent=4) json.dump(data, f, indent=4)
return True return True
@@ -772,8 +791,7 @@ class Main(QWidget):
item = QTableWidgetItem("今日已代理" + str(data[i][12]) + "次") item = QTableWidgetItem("今日已代理" + str(data[i][12]) + "次")
item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
elif j == 9: elif j == 9:
item = QTableWidgetItem(str(value)) item = QTableWidgetItem(str(value).replace("\\", "/"))
item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
elif j == 10: elif j == 10:
if self.PASSWORD == "": if self.PASSWORD == "":
item = QTableWidgetItem("******") item = QTableWidgetItem("******")
@@ -840,7 +858,7 @@ class Main(QWidget):
"1-7", "1-7",
"-", "-",
"-", "-",
"暂不支持", "-",
self.encryptx("未设置"), self.encryptx("未设置"),
self.userlist.rowCount(), self.userlist.rowCount(),
), ),
@@ -891,6 +909,8 @@ class Main(QWidget):
games[gamein.strip()] = gameout.strip() games[gamein.strip()] = gameout.strip()
if text in games: if text in games:
text = games[text] text = games[text]
if item.column() == 9:
text = text.replace("\\", "/")
if item.column() == 10: if item.column() == 10:
text = self.encryptx(text) text = self.encryptx(text)
if text != "": if text != "":

4
gui/ui/main.ui
View File

@@ -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;"> </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=" 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="-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="-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="-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=" 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> <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>

8
res/info.txt
View File

@@ -4,7 +4,7 @@ VSVersionInfo(
ffi=FixedFileInfo( ffi=FixedFileInfo(
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
# Set not needed items to zero 0. # Set not needed items to zero 0.
filevers=(3, 0, 0, 0), filevers=(3, 1, 0, 0),
prodvers=(0, 0, 0, 0), prodvers=(0, 0, 0, 0),
# Contains a bitmask that specifies the valid bits 'flags'r # Contains a bitmask that specifies the valid bits 'flags'r
mask=0x3f, mask=0x3f,
@@ -31,13 +31,13 @@ VSVersionInfo(
[StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'), [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),
StringStruct('CompanyName', 'AUTO_MAA Team'), StringStruct('CompanyName', 'AUTO_MAA Team'),
StringStruct('FileDescription', 'AUTO_MAA Component'), StringStruct('FileDescription', 'AUTO_MAA Component'),
StringStruct('FileVersion', '3.0'), StringStruct('FileVersion', '3.1'),
StringStruct('InternalName', 'AUTO_MAA'), StringStruct('InternalName', 'AUTO_MAA'),
StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'), StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),
StringStruct('OriginalFilename', 'AUTO_MAA'), StringStruct('OriginalFilename', 'AUTO_MAA'),
StringStruct('ProductName', 'AUTO_MAA'), StringStruct('ProductName', 'AUTO_MAA'),
StringStruct('ProductVersion', 'v3.0_Beta'), StringStruct('ProductVersion', 'v3.1'),
StringStruct('Assembly Version', 'v3.0_Beta')]) StringStruct('Assembly Version', 'v3.1')])
]) ])
] ]
) )

5
res/set.txt
View File

@@ -21,6 +21,11 @@
"Infrast.CustomInfrastPlanShowInFightSettings": "False" #显示基建计划 "Infrast.CustomInfrastPlanShowInFightSettings": "False" #显示基建计划
"Penguin.EnablePenguin": "True" #上报企鹅物流 "Penguin.EnablePenguin": "True" #上报企鹅物流
"Yituliu.EnableYituliu": "True" #上报一图流 "Yituliu.EnableYituliu": "True" #上报一图流
#基建换班
"Infrast.CustomInfrastEnabled": "True" #启用自定义基建配置
"Infrast.DefaultInfrast": "user_defined" #内置配置
"Infrast.IsCustomInfrastFileReadOnly": "False" #自定义基建配置文件只读
"Infrast.CustomInfrastFile": "" #自定义基建配置文件地址
#设置 #设置
"Start.RunDirectly": "True" #启动MAA后直接运行 "Start.RunDirectly": "True" #启动MAA后直接运行
"Start.StartEmulator": "True" #启动MAA后自动开启模拟器 "Start.StartEmulator": "True" #启动MAA后自动开启模拟器

4
toexe.py
View File

@@ -20,4 +20,6 @@
import os 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"
)

3
更新说明.txt
View File

@@ -1,3 +1,4 @@
项目初始阶段，不会提供专门的版本更新程序，您需要手动更新程序。 项目初始阶段，不会提供专门的版本更新程序，您需要手动更新程序。
v3.0_Beta版本采用全新的架构，您需要手动输入之前的信息。 v2.1.5及以前的用户，由于新版本采用全新的架构，您需要手动输入之前的信息。
v3.0_Beta版用户，直接用AUTO_MAA.exe替代gui.exe后，重新设置每个用户的“自定义基建”选项（输入“-”以关闭该功能，输入自定义基建配置文件地址以开启该功能）。
新用户请忽略本说明。 新用户请忽略本说明。