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

fix: 适配 MAA 任务及基建设施日志翻译

Browse Source
This commit is contained in:
DLmaster361
2025-07-15 16:20:09 +08:00
parent 403f69df8b
commit a2f4adb647
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/MAA.py
View File

@@ -1122,21 +1122,25 @@ class MaaManager(QObject):
elif "任务已全部完成！" in log:
if "完成任务: StartUp" in log:
if "完成任务: StartUp" in log or "完成任务: 开始唤醒" in log:
self.task_dict["WakeUp"] = "False"
if "完成任务: Recruit" in log:
if "完成任务: Recruit" in log or "完成任务: 自动公招" in log:
self.task_dict["Recruiting"] = "False"
if "完成任务: Infrast" in log:
if "完成任务: Infrast" in log or "完成任务: 基建换班" in log:
self.task_dict["Base"] = "False"
if "完成任务: Fight" in log or "剿灭任务失败" in log:
if (
"完成任务: Fight" in log
or "完成任务: 刷理智" in log
or "剿灭任务失败" in log
):
self.task_dict["Combat"] = "False"
if "完成任务: Mall" in log:
if "完成任务: Mall" in log or "完成任务: 获取信用及购物" in log:
self.task_dict["Mall"] = "False"
if "完成任务: Award" in log:
if "完成任务: Award" in log or "完成任务: 领取奖励" in log:
self.task_dict["Mission"] = "False"
if "完成任务: Roguelike" in log:
if "完成任务: Roguelike" in log or "完成任务: 自动肉鸽" in log:
self.task_dict["AutoRoguelike"] = "False"
if "完成任务: Reclamation" in log:
if "完成任务: Reclamation" in log or "完成任务: 生息演算" in log:
self.task_dict["Reclamation"] = "False"
if all(v == "False" for v in self.task_dict.values()):
@@ -1171,7 +1175,7 @@ class MaaManager(QObject):
self.maa_result = "Wait"
elif mode == "人工排查":
if "完成任务: StartUp" in log:
if "完成任务: StartUp" in log or "完成任务: 开始唤醒" in log:
self.maa_result = "Success!"
elif "请 ｢检查连接设置｣ → ｢尝试重启模拟器与 ADB｣ → ｢重启电脑｣" in log:
self.maa_result = "MAA的ADB连接异常"

3
resources/version.json
View File

@@ -3,7 +3,8 @@
"version_info": {
"4.4.0.0": {
"修复BUG": [
"信任系统证书，并添加网络代理地址配置项 #50"
"信任系统证书，并添加网络代理地址配置项 #50",
"适配 MAA 任务及基建设施日志翻译"
],
"程序优化": [
"重构历史记录保存与载入逻辑"