From fd75dda2b10babde77d803472870f772081b42b7 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 6 May 2025 13:57:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E9=80=82=E9=85=8DMAA=E8=BF=9E?= =?UTF-8?q?=E6=88=98=E6=AC=A1=E6=95=B0`AUTO`=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 9 +++++++-- app/models/MAA.py | 12 ++++++------ app/ui/member_manager.py | 5 +++-- resources/version.json | 7 ++++++- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index aca4870..354d057 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -532,7 +532,12 @@ class MaaUserConfig(QConfig): self.Info_MedicineNumb = ConfigItem( "Info", "MedicineNumb", 0, RangeValidator(0, 1024) ) - self.Info_SeriesNumb = ConfigItem("Info", "SeriesNumb", 1, RangeValidator(1, 6)) + self.Info_SeriesNumb = OptionsConfigItem( + "Info", + "SeriesNumb", + "1", + OptionsValidator(["1000", "6", "5", "4", "3", "2", "1"]), + ) self.Info_GameId = ConfigItem("Info", "GameId", "-") self.Info_GameId_1 = ConfigItem("Info", "GameId_1", "-") self.Info_GameId_2 = ConfigItem("Info", "GameId_2", "-") @@ -617,7 +622,7 @@ class MaaUserConfig(QConfig): class AppConfig(GlobalConfig): - VERSION = "4.3.6.5" + VERSION = "4.3.6.0" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/app/models/MAA.py b/app/models/MAA.py index bc48084..afe5cab 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -1278,9 +1278,9 @@ class MaaManager(QObject): ) # 剩余理智关卡 data["Configurations"]["Default"][ "MainFunction.Series.Quantity" - ] = str( - user_data["Info"]["SeriesNumb"] - ) # 连战次数 + ] = user_data["Info"][ + "SeriesNumb" + ] # 连战次数 data["Configurations"]["Default"][ "Penguin.IsDrGrandet" ] = "False" # 博朗台模式 @@ -1382,9 +1382,9 @@ class MaaManager(QObject): ) # 剩余理智关卡 data["Configurations"]["Default"][ "MainFunction.Series.Quantity" - ] = str( - user_data["Info"]["SeriesNumb"] - ) # 连战次数 + ] = user_data["Info"][ + "SeriesNumb" + ] # 连战次数 data["Configurations"]["Default"][ "GUI.UseAlternateStage" ] = "True" # 备选关卡 diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index 4d40ab2..ca1791c 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -1421,15 +1421,16 @@ class MemberManager(QWidget): configItem=self.config.Info_MedicineNumb, parent=self, ) - self.card_SeriesNumb = SpinBoxSettingCard( + self.card_SeriesNumb = ComboBoxSettingCard( icon=FluentIcon.GAME, title="连战次数", content="连战次数较大时建议搭配剩余理智关卡使用", - range=(1, 6), + texts=["AUTO", "6", "5", "4", "3", "2", "1"], qconfig=self.config, configItem=self.config.Info_SeriesNumb, parent=self, ) + self.card_SeriesNumb.comboBox.setMinimumWidth(150) self.card_GameId = EditableComboBoxSettingCard( icon=FluentIcon.GAME, title="关卡选择", diff --git a/resources/version.json b/resources/version.json index 64208d4..953de20 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,8 +1,13 @@ { - "main_version": "4.3.6.5", + "main_version": "4.3.6.0", "updater_version": "1.0.0.0", "announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n- 添加强制关闭ADB与模拟器等增强任务项\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n- 修复`检测到MAA未能实际执行任务`报错被异常屏蔽\n- 修复MAA超时判定异常失效\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作\n- 公告样式优化", "version_info": { + "4.3.6.0": { + "新增功能": [ + "适配MAA连战次数`AUTO`模式" + ] + }, "4.3.6.5": { "新增功能": [ "release中添加安装程序"