From a3fe641f6b04cf01f7b5327c8541fbbf2a5e58bb Mon Sep 17 00:00:00 2001 From: DLmaster Date: Thu, 7 Nov 2024 17:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0`=E5=90=AF=E5=8A=A8AUTO=5FMAA?= =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5=E4=BB=A3=E7=90=86`=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTO_MAA.py | 23 +++++++++- gui/ui/main.ui | 102 +++++++++++++++++++++++++++++++++++++----- res/AUTO_MAA_info.txt | 8 ++-- res/version.json | 8 ++-- 4 files changed, 122 insertions(+), 19 deletions(-) diff --git a/AUTO_MAA.py b/AUTO_MAA.py index 9deca74..97dcdd0 100644 --- a/AUTO_MAA.py +++ b/AUTO_MAA.py @@ -1084,7 +1084,6 @@ def __init__(self, PASSWARD=""): ] self.ui = uiLoader.load(self.app_path + "/gui/ui/main.ui") - self.ui.setWindowTitle("AUTO_MAA") self.ui.setWindowIcon(QIcon(self.app_path + "/res/AUTO_MAA.ico")) # 检查文件完整性 self.initialize() @@ -1162,6 +1161,11 @@ def __init__(self, PASSWARD=""): self.if_sleep = self.ui.findChild(QCheckBox, "checkBox_ifsleep") self.if_sleep.stateChanged.connect(self.change_config) + self.if_proxy_directly = self.ui.findChild( + QCheckBox, "checkBox_ifproxydirectly" + ) + self.if_proxy_directly.stateChanged.connect(self.change_config) + self.check_update = self.ui.findChild(QPushButton, "pushButton_check_update") self.check_update.clicked.connect(self.check_version) @@ -1222,6 +1226,9 @@ def __init__(self, PASSWARD=""): self.update_config() self.change_userlist_method() + if self.config["Default"]["SelfSet.IfProxyDirectly"] == "True": + self.routine_starter() + def initialize(self): """初始化程序的配置文件""" # 检查目录 @@ -1299,6 +1306,7 @@ def check_config(self): ["TimesLimit.run", 3], ["SelfSet.IfSelfStart", "False"], ["SelfSet.IfSleep", "False"], + ["SelfSet.IfProxyDirectly", "False"], ] # 导入配置文件 with open(self.config_path, "r", encoding="utf-8") as f: @@ -1710,6 +1718,10 @@ def update_config(self): bool(self.config["Default"]["SelfSet.IfSleep"] == "True") ) + self.if_proxy_directly.setChecked( + bool(self.config["Default"]["SelfSet.IfProxyDirectly"] == "True") + ) + for i in range(10): self.start_time[i][0].setChecked( bool(self.config["Default"]["TimeSet.set" + str(i + 1)] == "True") @@ -2093,6 +2105,7 @@ def change_config(self): """将GUI中发生修改的程序配置同步至self.config变量""" if not self.if_update_config: return None + self.config["Default"]["MaaSet.path"] = self.maa_path.text().replace("\\", "/") if not self.check_maa_path(): self.config["Default"]["MaaSet.path"] = "" @@ -2103,6 +2116,7 @@ def change_config(self): self.ui, "错误", "未找到MAA.exe或MAA配置文件，请重新设置MAA路径！" ) return None + self.config["Default"]["TimeLimit.routine"] = self.routine.value() self.config["Default"]["TimeLimit.annihilation"] = self.annihilation.value() self.config["Default"]["TimesLimit.run"] = self.num.value() @@ -2117,6 +2131,11 @@ def change_config(self): else: self.config["Default"]["SelfSet.IfSelfStart"] = "False" + if self.if_proxy_directly.isChecked(): + self.config["Default"]["SelfSet.IfProxyDirectly"] = "True" + else: + self.config["Default"]["SelfSet.IfProxyDirectly"] = "False" + for i in range(10): if self.start_time[i][0].isChecked(): self.config["Default"]["TimeSet.set" + str(i + 1)] = "True" @@ -2124,8 +2143,10 @@ def change_config(self): self.config["Default"]["TimeSet.set" + str(i + 1)] = "False" time = self.start_time[i][1].time().toString("HH:mm") self.config["Default"]["TimeSet.run" + str(i + 1)] = time + with open(self.config_path, "w", encoding="utf-8") as f: json.dump(self.config, f, indent=4) + self.update_config() def change_userlist_method(self): diff --git a/gui/ui/main.ui b/gui/ui/main.ui index 2ce015a..a6151ab 100644 --- a/gui/ui/main.ui +++ b/gui/ui/main.ui @@ -189,8 +189,8 @@ 0 0 - 1156 - 546 + 88 + 74 @@ -1037,8 +1037,8 @@ AUTO_MAA设置 - - + + QFrame::Shape::StyledPanel @@ -1054,10 +1054,23 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + - + Qt::Orientation::Horizontal @@ -1070,7 +1083,7 @@ - + QFrame::Shape::StyledPanel @@ -1086,10 +1099,23 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + - + Qt::Orientation::Horizontal @@ -1102,7 +1128,52 @@ - + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Raised + + + + + + 启动AUTO_MAA后直接代理 + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + + + Qt::Orientation::Horizontal + + + + 231 + 20 + + + + + QFrame::Shape::StyledPanel @@ -1147,6 +1218,19 @@ + + + + Qt::Orientation::Horizontal + + + + 311 + 20 + + + + @@ -1184,8 +1268,6 @@ 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_v4.1.0，版本更新程序上线。</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;"> 使用本程序前，请先仔细阅读README.md。</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;"> 对于B服用户，由于我们无权替您同意用户协议，若出现用户协议弹窗，您需要自行完成确认，否则可能造成MAA卡死，代理任务失败。</p> diff --git a/res/AUTO_MAA_info.txt b/res/AUTO_MAA_info.txt index d3811af..75eb12a 100644 --- a/res/AUTO_MAA_info.txt +++ b/res/AUTO_MAA_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=(4, 1, 1, 0), + filevers=(4, 1, 1, 1), 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', '4.1.1.0'), + StringStruct('FileVersion', '4.1.1.1'), StringStruct('InternalName', 'AUTO_MAA'), StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'), StringStruct('OriginalFilename', 'AUTO_MAA.py'), StringStruct('ProductName', 'AUTO_MAA'), - StringStruct('ProductVersion', 'v4.1.1.0'), - StringStruct('Assembly Version', 'v4.1.1.0')]) + StringStruct('ProductVersion', 'v4.1.1.1'), + StringStruct('Assembly Version', 'v4.1.1.1')]) ]) ] ) \ No newline at end of file diff --git a/res/version.json b/res/version.json index 224eda1..2d12428 100644 --- a/res/version.json +++ b/res/version.json @@ -1,7 +1,7 @@ { - "main_version": "4.1.1.0", - "main_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.1/AUTO_MAA_v4.1.1.zip", + "main_version": "4.1.1.1", + "main_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.1_beta/AUTO_MAA_v4.1.1_beta.zip", "updater_version": "1.0.0.0", - "updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.1/Updater_v1.0.0.zip", - "announcement": "\n## 修复BUG\n- 适配MAA的`启动MAA后自动开启模拟器`字段更改" + "updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.1_beta/Updater_v1.0.0.zip", + "announcement": "\n# 开发中的版本！非开发者勿直接更新！！否则后果自负！！！\n## 新增功能\n- 添加`启动AUTO_MAA后直接代理`功能" } \ No newline at end of file