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

feat(ui): 适配MAA连战次数AUTO模式

Browse Source
This commit is contained in:
DLmaster361
2025-05-06 13:57:49 +08:00
parent 2058c0218c
commit fd75dda2b1
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/core/config.py
View File

@@ -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()

12
app/models/MAA.py
View File

@@ -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" # 备选关卡

5
app/ui/member_manager.py
View File

@@ -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="关卡选择",

7
resources/version.json
View File

@@ -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中添加安装程序"