From a2f4adb647ad0ad7c488cf5717717d28a70fe46d Mon Sep 17 00:00:00 2001
From: DLmaster361 <DLmaster_361@163.com>
Date: Tue, 15 Jul 2025 16:20:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=20MAA=20=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=8A=E5=9F=BA=E5=BB=BA=E8=AE=BE=E6=96=BD=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/MAA.py      | 22 +++++++++++++---------
 resources/version.json |  3 ++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/models/MAA.py b/app/models/MAA.py
index 490197d..fda0410 100644
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -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连接异常"
diff --git a/resources/version.json b/resources/version.json
index 19593e4..6c0a5e8 100644
--- a/resources/version.json
+++ b/resources/version.json
@@ -3,7 +3,8 @@
     "version_info": {
         "4.4.0.0": {
             "修复BUG": [
-                "信任系统证书，并添加网络代理地址配置项 #50"
+                "信任系统证书，并添加网络代理地址配置项 #50",
+                "适配 MAA 任务及基建设施日志翻译"
             ],
             "程序优化": [
                 "重构历史记录保存与载入逻辑"