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

feat(maa): 适配 MAA 长期开放剿灭关卡 #58

Browse Source
This commit is contained in:
DLmaster361
2025-07-31 16:13:35 +08:00
parent b27f2c43ae
commit 4fc747f1c6
6 changed files with 243 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/core/config.py
View File

@@ -379,16 +379,32 @@ class MaaUserConfig(LQConfig):
) )
self.Info_StageMode = ConfigItem("Info", "StageMode", "固定") self.Info_StageMode = ConfigItem("Info", "StageMode", "固定")
self.Info_Server = OptionsConfigItem( self.Info_Server = OptionsConfigItem(
"Info", "Server", "Official", OptionsValidator(["Official", "Bilibili"]) "Info",
"Server",
"Official",
OptionsValidator(
["Official", "Bilibili", "YoStarEN", "YoStarJP", "YoStarKR", "txwy"]
),
) )
self.Info_Status = ConfigItem("Info", "Status", True, BoolValidator()) self.Info_Status = ConfigItem("Info", "Status", True, BoolValidator())
self.Info_RemainedDay = ConfigItem( self.Info_RemainedDay = ConfigItem(
"Info", "RemainedDay", -1, RangeValidator(-1, 1024) "Info", "RemainedDay", -1, RangeValidator(-1, 1024)
) )
self.Info_Annihilation = ConfigItem( self.Info_Annihilation = OptionsConfigItem(
"Info", "Annihilation", False, BoolValidator() "Info",
"Annihilation",
"Annihilation",
OptionsValidator(
[
"Close",
"Annihilation",
"Chernobog@Annihilation",
"LungmenOutskirts@Annihilation",
"LungmenDowntown@Annihilation",
]
),
) )
self.Info_Routine = ConfigItem("Info", "Routine", False, BoolValidator()) self.Info_Routine = ConfigItem("Info", "Routine", True, BoolValidator())
self.Info_InfrastMode = OptionsConfigItem( self.Info_InfrastMode = OptionsConfigItem(
"Info", "Info",
"InfrastMode", "InfrastMode",

484
app/models/MAA.py
View File

@@ -226,13 +226,6 @@ class MaaManager(QObject):
logger.info(f"开始代理用户: {user[0]}", module=f"MAA调度器-{self.name}") logger.info(f"开始代理用户: {user[0]}", module=f"MAA调度器-{self.name}")
# 初始化代理情况记录和模式替换表
run_book = {"Annihilation": False, "Routine": False}
mode_book = {
"Annihilation": "自动代理_剿灭",
"Routine": "自动代理_日常",
}
# 简洁模式用户默认开启日常选项 # 简洁模式用户默认开启日常选项
if user_data["Info"]["Mode"] == "简洁": if user_data["Info"]["Mode"] == "简洁":
user_data["Info"]["Routine"] = True user_data["Info"]["Routine"] = True
@@ -240,6 +233,16 @@ class MaaManager(QObject):
elif user_data["Info"]["Mode"] == "详细": elif user_data["Info"]["Mode"] == "详细":
self.if_open_emulator = True self.if_open_emulator = True
# 初始化代理情况记录和模式替换表
run_book = {
"Annihilation": bool(user_data["Info"]["Annihilation"] == "Close"),
"Routine": not user_data["Info"]["Routine"],
}
mode_book = {
"Annihilation": "自动代理_剿灭",
"Routine": "自动代理_日常",
}
user_logs_list = [] user_logs_list = []
user_start_time = datetime.now() user_start_time = datetime.now()
@@ -309,6 +312,9 @@ class MaaManager(QObject):
if self.isInterruptionRequested: if self.isInterruptionRequested:
break break
if run_book[mode]:
continue
# 剿灭模式；满足条件跳过剿灭 # 剿灭模式；满足条件跳过剿灭
if ( if (
mode == "Annihilation" mode == "Annihilation"
@@ -327,27 +333,24 @@ class MaaManager(QObject):
else: else:
self.weekly_annihilation_limit_reached = False self.weekly_annihilation_limit_reached = False
if not user_data["Info"][mode]: if (
run_book[mode] = True user_data["Info"]["Mode"] == "详细"
continue and not (
self.data[user[2]]["Path"] / "Routine/gui.json"
if user_data["Info"]["Mode"] == "详细": ).exists()
):
if not ( logger.error(
self.data[user[2]]["Path"] / f"{mode}/gui.json" f"用户: {user[0]} - 未找到日常详细配置文件",
).exists(): module=f"MAA调度器-{self.name}",
logger.error( )
f"用户: {user[0]} - 未找到{mode_book[mode][5:7]}配置文件", self.push_info_bar.emit(
module=f"MAA调度器-{self.name}", "error",
) "启动MAA代理进程失败",
self.push_info_bar.emit( f"未找到{user[0]}的详细配置文件！",
"error", -1,
"启动MAA代理进程失败", )
f"未找到{user[0]}的{mode_book[mode][5:7]}配置文件！", run_book[mode] = False
-1, break
)
run_book[mode] = False
continue
# 更新当前模式到界面 # 更新当前模式到界面
self.update_user_list.emit( self.update_user_list.emit(
@@ -377,55 +380,19 @@ class MaaManager(QObject):
elif mode == "Annihilation": elif mode == "Annihilation":
if user_data["Info"]["Mode"] == "简洁": self.task_dict = {
"WakeUp": "True",
self.task_dict = { "Recruiting": "False",
"WakeUp": "True", "Base": "False",
"Recruiting": "False", "Combat": "True",
"Base": "False", "Mission": "False",
"Combat": "True", "Mall": "False",
"Mission": "False", "AutoRoguelike": "False",
"Mall": "False", "Reclamation": "False",
"AutoRoguelike": "False", }
"Reclamation": "False",
}
elif user_data["Info"]["Mode"] == "详细":
with (self.data[user[2]]["Path"] / f"{mode}/gui.json").open(
mode="r", encoding="utf-8"
) as f:
data = json.load(f)
self.task_dict = {
"WakeUp": data["Configurations"]["Default"][
"TaskQueue.WakeUp.IsChecked"
],
"Recruiting": data["Configurations"]["Default"][
"TaskQueue.Recruiting.IsChecked"
],
"Base": data["Configurations"]["Default"][
"TaskQueue.Base.IsChecked"
],
"Combat": data["Configurations"]["Default"][
"TaskQueue.Combat.IsChecked"
],
"Mission": data["Configurations"]["Default"][
"TaskQueue.Mission.IsChecked"
],
"Mall": data["Configurations"]["Default"][
"TaskQueue.Mall.IsChecked"
],
"AutoRoguelike": data["Configurations"]["Default"][
"TaskQueue.AutoRoguelike.IsChecked"
],
"Reclamation": data["Configurations"]["Default"][
"TaskQueue.Reclamation.IsChecked"
],
}
logger.info( logger.info(
f"用户: {user[0]} - 模式: {mode_book[mode]} - 任务列表: {list(self.task_dict.values())}", f"用户: {user[0]} - 模式: {mode_book[mode]} - 任务列表: {self.task_dict.values()}",
module=f"MAA调度器-{self.name}", module=f"MAA调度器-{self.name}",
) )
@@ -439,7 +406,8 @@ class MaaManager(QObject):
break break
logger.info( logger.info(
f"用户: {user[0]} - 模式: {mode_book[mode]} - 尝试次数: {i + 1}/{self.set["RunSet"]["RunTimesLimit"]}" f"用户: {user[0]} - 模式: {mode_book[mode]} - 尝试次数: {i + 1}/{self.set["RunSet"]["RunTimesLimit"]}",
module=f"MAA调度器-{self.name}",
) )
# 配置MAA # 配置MAA
@@ -1223,10 +1191,13 @@ class MaaManager(QObject):
log = "".join(self.maa_logs) log = "".join(self.maa_logs)
# 更新MAA日志 # 更新MAA日志
if len(self.maa_logs) > 100: if self.maa_process_manager.is_running():
self.update_log_text.emit("".join(self.maa_logs[-100:]))
else: self.update_log_text.emit(
self.update_log_text.emit("".join(self.maa_logs)) "".join(self.maa_logs)
if len(self.maa_logs) < 100
else "".join(self.maa_logs[-100:])
)
if "自动代理" in self.log_check_mode: if "自动代理" in self.log_check_mode:
@@ -1390,8 +1361,14 @@ class MaaManager(QObject):
) )
if "设置MAA" not in self.mode and "更新MAA" not in mode: if "设置MAA" not in self.mode and "更新MAA" not in mode:
user_data = self.data[index]["Config"] user_data = self.data[index]["Config"]
if user_data["Info"]["Server"] == "Bilibili":
self.agree_bilibili(True)
else:
self.agree_bilibili(False)
# 配置MAA前关闭可能未正常退出的MAA进程 # 配置MAA前关闭可能未正常退出的MAA进程
self.maa_process_manager.kill(if_force=True) self.maa_process_manager.kill(if_force=True)
System.kill_process(self.maa_exe_path) System.kill_process(self.maa_exe_path)
@@ -1414,16 +1391,9 @@ class MaaManager(QObject):
self.maa_set_path, self.maa_set_path,
) )
elif "自动代理" in mode and user_data["Info"]["Mode"] == "详细": elif "自动代理" in mode and user_data["Info"]["Mode"] == "详细":
if mode == "自动代理_剿灭": shutil.copy(
shutil.copy( self.data[index]["Path"] / "Routine/gui.json", self.maa_set_path
self.data[index]["Path"] / "Annihilation/gui.json", )
self.maa_set_path,
)
elif mode == "自动代理_日常":
shutil.copy(
self.data[index]["Path"] / "Routine/gui.json",
self.maa_set_path,
)
elif "人工排查" in mode and user_data["Info"]["Mode"] == "详细": elif "人工排查" in mode and user_data["Info"]["Mode"] == "详细":
shutil.copy( shutil.copy(
self.data[index]["Path"] / "Routine/gui.json", self.data[index]["Path"] / "Routine/gui.json",
@@ -1432,32 +1402,19 @@ class MaaManager(QObject):
with self.maa_set_path.open(mode="r", encoding="utf-8") as f: with self.maa_set_path.open(mode="r", encoding="utf-8") as f:
data = json.load(f) data = json.load(f)
if ("设置MAA" not in self.mode and "更新MAA" not in mode) and (
(
user_data["Info"]["Mode"] == "简洁"
and user_data["Info"]["Server"] == "Bilibili"
)
or (
user_data["Info"]["Mode"] == "详细"
and data["Configurations"]["Default"]["Start.ClientType"] == "Bilibili"
)
):
self.agree_bilibili(True)
else:
self.agree_bilibili(False)
# 切换配置 # 切换配置
if data["Current"] != "Default": if data["Current"] != "Default":
data["Configurations"]["Default"] = data["Configurations"][data["Current"]] data["Configurations"]["Default"] = data["Configurations"][data["Current"]]
data["Current"] = "Default" data["Current"] = "Default"
# 时间设置
for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False"
# 自动代理配置 # 自动代理配置
if "自动代理" in mode: if "自动代理" in mode:
for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
if ( if (
next((i for i, _ in enumerate(self.user_list) if _[2] == index), None) next((i for i, _ in enumerate(self.user_list) if _[2] == index), None)
== len(self.user_list) - 1 == len(self.user_list) - 1
@@ -1504,6 +1461,11 @@ class MaaManager(QObject):
data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标 data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标
data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘 data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘
# 客户端类型
data["Configurations"]["Default"]["Start.ClientType"] = user_data["Info"][
"Server"
]
# 账号切换 # 账号切换
if user_data["Info"]["Server"] == "Official": if user_data["Info"]["Server"] == "Official":
data["Configurations"]["Default"]["Start.AccountName"] = ( data["Configurations"]["Default"]["Start.AccountName"] = (
@@ -1542,15 +1504,9 @@ class MaaManager(QObject):
self.task_dict["Reclamation"] self.task_dict["Reclamation"]
) # 生息演算 ) # 生息演算
if user_data["Info"]["Mode"] == "简洁": # 整理任务顺序
if "剿灭" in mode or user_data["Info"]["Mode"] == "简洁":
data["Configurations"]["Default"]["Start.ClientType"] = user_data[
"Info"
][
"Server"
] # 客户端类型
# 整理任务顺序
data["Configurations"]["Default"]["TaskQueue.Order.WakeUp"] = "0" data["Configurations"]["Default"]["TaskQueue.Order.WakeUp"] = "0"
data["Configurations"]["Default"]["TaskQueue.Order.Recruiting"] = "1" data["Configurations"]["Default"]["TaskQueue.Order.Recruiting"] = "1"
data["Configurations"]["Default"]["TaskQueue.Order.Base"] = "2" data["Configurations"]["Default"]["TaskQueue.Order.Base"] = "2"
@@ -1560,96 +1516,104 @@ class MaaManager(QObject):
data["Configurations"]["Default"]["TaskQueue.Order.AutoRoguelike"] = "6" data["Configurations"]["Default"]["TaskQueue.Order.AutoRoguelike"] = "6"
data["Configurations"]["Default"]["TaskQueue.Order.Reclamation"] = "7" data["Configurations"]["Default"]["TaskQueue.Order.Reclamation"] = "7"
if "剿灭" in mode: data["Configurations"]["Default"]["MainFunction.UseMedicine"] = (
"False" if user_data["Info"]["MedicineNumb"] == 0 else "True"
) # 吃理智药
data["Configurations"]["Default"]["MainFunction.UseMedicine.Quantity"] = (
str(user_data["Info"]["MedicineNumb"])
) # 吃理智药数量
data["Configurations"]["Default"][
"MainFunction.Series.Quantity"
] = user_data["Info"][
"SeriesNumb"
] # 连战次数
if "剿灭" in mode:
data["Configurations"]["Default"][
"MainFunction.Stage1"
] = "Annihilation" # 主关卡
data["Configurations"]["Default"][
"MainFunction.Stage2"
] = "" # 备选关卡1
data["Configurations"]["Default"][
"MainFunction.Stage3"
] = "" # 备选关卡2
data["Configurations"]["Default"][
"Fight.RemainingSanityStage"
] = "" # 剩余理智关卡
data["Configurations"]["Default"][
"MainFunction.Series.Quantity"
] = "1" # 连战次数
data["Configurations"]["Default"][
"MainFunction.Annihilation.UseCustom"
] = "True" # 自定义剿灭关卡
data["Configurations"]["Default"][
"MainFunction.Annihilation.Stage"
] = user_data["Info"][
"Annihilation"
] # 自定义剿灭关卡号
data["Configurations"]["Default"][
"Penguin.IsDrGrandet"
] = "False" # 博朗台模式
data["Configurations"]["Default"][
"GUI.CustomStageCode"
] = "True" # 手动输入关卡名
data["Configurations"]["Default"][
"GUI.UseAlternateStage"
] = "False" # 使用备选关卡
data["Configurations"]["Default"][
"Fight.UseRemainingSanityStage"
] = "False" # 使用剩余理智
data["Configurations"]["Default"][
"Fight.UseExpiringMedicine"
] = "True" # 无限吃48小时内过期的理智药
data["Configurations"]["Default"][
"GUI.HideSeries"
] = "False" # 隐藏连战次数
elif "日常" in mode:
data["Configurations"]["Default"]["MainFunction.Stage1"] = (
user_data["Info"]["Stage"]
if user_data["Info"]["Stage"] != "-"
else ""
) # 主关卡
data["Configurations"]["Default"]["MainFunction.Stage2"] = (
user_data["Info"]["Stage_1"]
if user_data["Info"]["Stage_1"] != "-"
else ""
) # 备选关卡1
data["Configurations"]["Default"]["MainFunction.Stage3"] = (
user_data["Info"]["Stage_2"]
if user_data["Info"]["Stage_2"] != "-"
else ""
) # 备选关卡2
data["Configurations"]["Default"]["MainFunction.Stage4"] = (
user_data["Info"]["Stage_3"]
if user_data["Info"]["Stage_3"] != "-"
else ""
) # 备选关卡3
data["Configurations"]["Default"]["Fight.RemainingSanityStage"] = (
user_data["Info"]["Stage_Remain"]
if user_data["Info"]["Stage_Remain"] != "-"
else ""
) # 剩余理智关卡
data["Configurations"]["Default"][
"GUI.UseAlternateStage"
] = "True" # 备选关卡
data["Configurations"]["Default"]["Fight.UseRemainingSanityStage"] = (
"True" if user_data["Info"]["Stage_Remain"] != "-" else "False"
) # 使用剩余理智
if user_data["Info"]["Mode"] == "简洁":
data["Configurations"]["Default"][
"MainFunction.Stage1"
] = "Annihilation" # 主关卡
data["Configurations"]["Default"][
"MainFunction.Stage2"
] = "" # 备选关卡1
data["Configurations"]["Default"][
"MainFunction.Stage3"
] = "" # 备选关卡2
data["Configurations"]["Default"][
"Fight.RemainingSanityStage"
] = "" # 剩余理智关卡
data["Configurations"]["Default"][
"MainFunction.Series.Quantity"
] = "1" # 连战次数
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Penguin.IsDrGrandet" "Penguin.IsDrGrandet"
] = "False" # 博朗台模式 ] = "False" # 博朗台模式
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"GUI.CustomStageCode" "GUI.CustomStageCode"
] = "True" # 手动输入关卡名 ] = "True" # 手动输入关卡名
data["Configurations"]["Default"][
"GUI.UseAlternateStage"
] = "False" # 使用备选关卡
data["Configurations"]["Default"][
"Fight.UseRemainingSanityStage"
] = "False" # 使用剩余理智
data["Configurations"]["Default"][
"Fight.UseExpiringMedicine"
] = "True" # 无限吃48小时内过期的理智药
data["Configurations"]["Default"][
"GUI.HideSeries"
] = "False" # 隐藏连战次数
elif "日常" in mode:
data["Configurations"]["Default"]["MainFunction.UseMedicine"] = (
"False" if user_data["Info"]["MedicineNumb"] == 0 else "True"
) # 吃理智药
data["Configurations"]["Default"][
"MainFunction.UseMedicine.Quantity"
] = str(
user_data["Info"]["MedicineNumb"]
) # 吃理智药数量
data["Configurations"]["Default"]["MainFunction.Stage1"] = (
user_data["Info"]["Stage"]
if user_data["Info"]["Stage"] != "-"
else ""
) # 主关卡
data["Configurations"]["Default"]["MainFunction.Stage2"] = (
user_data["Info"]["Stage_1"]
if user_data["Info"]["Stage_1"] != "-"
else ""
) # 备选关卡1
data["Configurations"]["Default"]["MainFunction.Stage3"] = (
user_data["Info"]["Stage_2"]
if user_data["Info"]["Stage_2"] != "-"
else ""
) # 备选关卡2
data["Configurations"]["Default"]["MainFunction.Stage4"] = (
user_data["Info"]["Stage_3"]
if user_data["Info"]["Stage_3"] != "-"
else ""
) # 备选关卡3
data["Configurations"]["Default"]["Fight.RemainingSanityStage"] = (
user_data["Info"]["Stage_Remain"]
if user_data["Info"]["Stage_Remain"] != "-"
else ""
) # 剩余理智关卡
data["Configurations"]["Default"][
"MainFunction.Series.Quantity"
] = user_data["Info"][
"SeriesNumb"
] # 连战次数
data["Configurations"]["Default"][
"Penguin.IsDrGrandet"
] = "False" # 博朗台模式
data["Configurations"]["Default"][
"GUI.CustomStageCode"
] = "True" # 手动输入关卡名
data["Configurations"]["Default"][
"GUI.UseAlternateStage"
] = "True" # 备选关卡
data["Configurations"]["Default"][
"Fight.UseRemainingSanityStage"
] = (
"True" if user_data["Info"]["Stage_Remain"] != "-" else "False"
) # 使用剩余理智
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Fight.UseExpiringMedicine" "Fight.UseExpiringMedicine"
] = "True" # 无限吃48小时内过期的理智药 ] = "True" # 无限吃48小时内过期的理智药
@@ -1701,60 +1665,7 @@ class MaaManager(QObject):
"InfrastMode" "InfrastMode"
] # 基建模式 ] # 基建模式
elif user_data["Info"]["Mode"] == "详细": elif user_data["Info"]["Mode"] == "详细":
if "剿灭" in mode:
pass
elif "日常" in mode:
data["Configurations"]["Default"]["MainFunction.UseMedicine"] = (
"False" if user_data["Info"]["MedicineNumb"] == 0 else "True"
) # 吃理智药
data["Configurations"]["Default"][
"MainFunction.UseMedicine.Quantity"
] = str(
user_data["Info"]["MedicineNumb"]
) # 吃理智药数量
data["Configurations"]["Default"]["MainFunction.Stage1"] = (
user_data["Info"]["Stage"]
if user_data["Info"]["Stage"] != "-"
else ""
) # 主关卡
data["Configurations"]["Default"]["MainFunction.Stage2"] = (
user_data["Info"]["Stage_1"]
if user_data["Info"]["Stage_1"] != "-"
else ""
) # 备选关卡1
data["Configurations"]["Default"]["MainFunction.Stage3"] = (
user_data["Info"]["Stage_2"]
if user_data["Info"]["Stage_2"] != "-"
else ""
) # 备选关卡2
data["Configurations"]["Default"]["MainFunction.Stage4"] = (
user_data["Info"]["Stage_3"]
if user_data["Info"]["Stage_3"] != "-"
else ""
) # 备选关卡3
data["Configurations"]["Default"]["Fight.RemainingSanityStage"] = (
user_data["Info"]["Stage_Remain"]
if user_data["Info"]["Stage_Remain"] != "-"
else ""
) # 剩余理智关卡
data["Configurations"]["Default"][
"MainFunction.Series.Quantity"
] = user_data["Info"][
"SeriesNumb"
] # 连战次数
data["Configurations"]["Default"][
"GUI.UseAlternateStage"
] = "True" # 备选关卡
data["Configurations"]["Default"][
"Fight.UseRemainingSanityStage"
] = (
"True" if user_data["Info"]["Stage_Remain"] != "-" else "False"
) # 使用剩余理智
# 基建模式 # 基建模式
if ( if (
@@ -1770,8 +1681,6 @@ class MaaManager(QObject):
# 人工排查配置 # 人工排查配置
elif "人工排查" in mode: elif "人工排查" in mode:
for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"MainFunction.PostActions" "MainFunction.PostActions"
] = "8" # 完成后退出MAA ] = "8" # 完成后退出MAA
@@ -1794,6 +1703,11 @@ class MaaManager(QObject):
"VersionUpdate.AutoInstallUpdatePackage" "VersionUpdate.AutoInstallUpdatePackage"
] = "False" # 自动安装更新包 ] = "False" # 自动安装更新包
# 客户端类型
data["Configurations"]["Default"]["Start.ClientType"] = user_data["Info"][
"Server"
]
# 账号切换 # 账号切换
if user_data["Info"]["Server"] == "Official": if user_data["Info"]["Server"] == "Official":
data["Configurations"]["Default"]["Start.AccountName"] = ( data["Configurations"]["Default"]["Start.AccountName"] = (
@@ -1806,14 +1720,6 @@ class MaaManager(QObject):
"Info" "Info"
]["Id"] ]["Id"]
if user_data["Info"]["Mode"] == "简洁":
data["Configurations"]["Default"]["Start.ClientType"] = user_data[
"Info"
][
"Server"
] # 客户端类型
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"TaskQueue.WakeUp.IsChecked" "TaskQueue.WakeUp.IsChecked"
] = "True" # 开始唤醒 ] = "True" # 开始唤醒
@@ -1842,8 +1748,6 @@ class MaaManager(QObject):
# 设置MAA配置 # 设置MAA配置
elif "设置MAA" in mode: elif "设置MAA" in mode:
for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"MainFunction.PostActions" "MainFunction.PostActions"
] = "0" # 完成后无动作 ] = "0" # 完成后无动作
@@ -1868,37 +1772,33 @@ class MaaManager(QObject):
"Start.MinimizeDirectly" "Start.MinimizeDirectly"
] = "False" # 启动MAA后直接最小化 ] = "False" # 启动MAA后直接最小化
if "全局" in mode: data["Configurations"]["Default"][
"TaskQueue.WakeUp.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 开始唤醒
"TaskQueue.WakeUp.IsChecked" data["Configurations"]["Default"][
] = "False" # 开始唤醒 "TaskQueue.Recruiting.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 自动公招
"TaskQueue.Recruiting.IsChecked" data["Configurations"]["Default"][
] = "False" # 自动公招 "TaskQueue.Base.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 基建换班
"TaskQueue.Base.IsChecked" data["Configurations"]["Default"][
] = "False" # 基建换班 "TaskQueue.Combat.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 刷理智
"TaskQueue.Combat.IsChecked" data["Configurations"]["Default"][
] = "False" # 刷理智 "TaskQueue.Mission.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 领取奖励
"TaskQueue.Mission.IsChecked" data["Configurations"]["Default"][
] = "False" # 领取奖励 "TaskQueue.Mall.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 获取信用及购物
"TaskQueue.Mall.IsChecked" data["Configurations"]["Default"][
] = "False" # 获取信用及购物 "TaskQueue.AutoRoguelike.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 自动肉鸽
"TaskQueue.AutoRoguelike.IsChecked" data["Configurations"]["Default"][
] = "False" # 自动肉鸽 "TaskQueue.Reclamation.IsChecked"
data["Configurations"]["Default"][ ] = "False" # 生息演算
"TaskQueue.Reclamation.IsChecked"
] = "False" # 生息演算
elif mode == "更新MAA": elif mode == "更新MAA":
for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"MainFunction.PostActions" "MainFunction.PostActions"
] = "0" # 完成后无动作 ] = "0" # 完成后无动作

11
app/models/general.py
View File

@@ -773,10 +773,13 @@ class GeneralManager(QObject):
log = "".join(self.script_logs) log = "".join(self.script_logs)
# 更新日志 # 更新日志
if len(self.script_logs) > 100: if self.script_process_manager.is_running():
self.update_log_text.emit("".join(self.script_logs[-100:]))
else: self.update_log_text.emit(
self.update_log_text.emit("".join(self.script_logs)) "".join(self.script_logs)
if len(self.script_logs) < 100
else "".join(self.script_logs[-100:])
)
if "自动代理" in self.mode: if "自动代理" in self.mode:

26
app/ui/script_manager.py
View File

@@ -1596,7 +1596,14 @@ class ScriptManager(QWidget):
icon=FluentIcon.PROJECTOR, icon=FluentIcon.PROJECTOR,
title="服务器", title="服务器",
content="选择服务器类型", content="选择服务器类型",
texts=["官服", "B服"], texts=[
"官服",
"B服",
"悠星国际服",
"悠星日服",
"悠星韩服",
"繁中服",
],
qconfig=self.config, qconfig=self.config,
configItem=self.config.Info_Server, configItem=self.config.Info_Server,
parent=self, parent=self,
@@ -1618,11 +1625,17 @@ class ScriptManager(QWidget):
configItem=self.config.Info_RemainedDay, configItem=self.config.Info_RemainedDay,
parent=self, parent=self,
) )
self.card_Annihilation = PushAndSwitchButtonSettingCard( self.card_Annihilation = ComboBoxSettingCard(
icon=FluentIcon.CAFE, icon=FluentIcon.CAFE,
title="剿灭代理", title="剿灭代理",
content="剿灭代理子任务相关设置", content="剿灭代理子任务相关设置",
text="设置具体配置", texts=[
"关闭",
"当期剿灭",
"切尔诺伯格",
"龙门外环",
"龙门市区",
],
qconfig=self.config, qconfig=self.config,
configItem=self.config.Info_Annihilation, configItem=self.config.Info_Annihilation,
parent=self, parent=self,
@@ -1977,9 +1990,6 @@ class ScriptManager(QWidget):
self.card_InfrastMode.comboBox.currentIndexChanged.connect( self.card_InfrastMode.comboBox.currentIndexChanged.connect(
self.switch_infrastructure self.switch_infrastructure
) )
self.card_Annihilation.clicked.connect(
lambda: self.set_maa("Annihilation")
)
self.card_Routine.clicked.connect( self.card_Routine.clicked.connect(
lambda: self.set_maa("Routine") lambda: self.set_maa("Routine")
) )
@@ -2004,15 +2014,11 @@ class ScriptManager(QWidget):
if self.config.get(self.config.Info_Mode) == "简洁": if self.config.get(self.config.Info_Mode) == "简洁":
self.card_Routine.setVisible(False) self.card_Routine.setVisible(False)
self.card_Server.setVisible(True)
self.card_Annihilation.button.setVisible(False)
self.card_InfrastMode.setVisible(True) self.card_InfrastMode.setVisible(True)
elif self.config.get(self.config.Info_Mode) == "详细": elif self.config.get(self.config.Info_Mode) == "详细":
self.card_Server.setVisible(False)
self.card_InfrastMode.setVisible(False) self.card_InfrastMode.setVisible(False)
self.card_Annihilation.button.setVisible(True)
self.card_Routine.setVisible(True) self.card_Routine.setVisible(True)
def switch_stage_mode(self) -> None: def switch_stage_mode(self) -> None:

4
resources/docs/MAA_config_info.txt
View File

@@ -27,6 +27,8 @@
"MainFunction.Stage4": "" #备选关卡3 "MainFunction.Stage4": "" #备选关卡3
"Fight.RemainingSanityStage": "Annihilation" #剩余理智关卡 "Fight.RemainingSanityStage": "Annihilation" #剩余理智关卡
"MainFunction.Series.Quantity": "1" #连战次数 "MainFunction.Series.Quantity": "1" #连战次数
"MainFunction.Annihilation.UseCustom": "True" #自定义剿灭关卡
"MainFunction.Annihilation.Stage": "Annihilation"、"Chernobog@Annihilation"、"LungmenOutskirts@Annihilation"、"LungmenDowntown@Annihilation" #自定义剿灭关卡号
"Penguin.IsDrGrandet": "True" #博朗台模式 "Penguin.IsDrGrandet": "True" #博朗台模式
"GUI.CustomStageCode": "False" #手动输入关卡名 "GUI.CustomStageCode": "False" #手动输入关卡名
"GUI.UseAlternateStage": "False" #使用备选关卡 "GUI.UseAlternateStage": "False" #使用备选关卡
@@ -45,7 +47,7 @@
"Infrast.IsCustomInfrastFileReadOnly": "False" #自定义基建配置文件只读 "Infrast.IsCustomInfrastFileReadOnly": "False" #自定义基建配置文件只读
"Infrast.CustomInfrastFile": "" #自定义基建配置文件地址 "Infrast.CustomInfrastFile": "" #自定义基建配置文件地址
#设置 #设置
"Start.ClientType": "Bilibili"、 "Official" #服务器 "Start.ClientType": "Official"、"Bilibili"、"YoStarEN"、"YoStarJP"、"YoStarKR"、"txwy" #服务器
G"Timer.Timer1": "False" #时间设置1 G"Timer.Timer1": "False" #时间设置1
"Connect.AdbPath" #ADB路径 "Connect.AdbPath" #ADB路径
"Connect.Address": "127.0.0.1:16448" #连接地址 "Connect.Address": "127.0.0.1:16448" #连接地址

6
resources/version.json
View File

@@ -2,10 +2,14 @@
"main_version": "4.4.1.5", "main_version": "4.4.1.5",
"version_info": { "version_info": {
"4.4.1.5": { "4.4.1.5": {
"新增功能": [
"适配 MAA 长期开放剿灭关卡"
],
"程序优化": [ "程序优化": [
"优化调度队列配置逻辑", "优化调度队列配置逻辑",
"优化静默进程标记逻辑，避免未能及时移除导致相关功能持续开启", "优化静默进程标记逻辑，避免未能及时移除导致相关功能持续开启",
"MAA 代理时更新改为强制开启" "MAA 代理时更新改为强制开启",
"移除 MAA 详细配置模式中的剿灭项"
] ]
}, },
"4.4.1.4": { "4.4.1.4": {