fix: 适配 MAA 剿灭关卡任务出错日志

app/core/config.py

@@ -704,7 +704,7 @@ class GeneralSubConfig(LQConfig):
 
 class AppConfig(GlobalConfig):
 
-    VERSION = "4.4.2.0"
+    VERSION = "4.4.3.0"
 
     stage_refreshed = Signal()
     PASSWORD_refreshed = Signal()

app/models/MAA.py

@@ -1232,7 +1232,7 @@ class MaaManager(QObject):
                 "自动代理_日常": "RoutineTimeLimit",
             }
 
-            if self.log_check_mode == "自动代理_剿灭" and "剿灭任务失败" in log:
+            if self.log_check_mode == "自动代理_剿灭" and "任务出错: 刷理智" in log:
                 self.weekly_annihilation_limit_reached = True
             else:
                 self.weekly_annihilation_limit_reached = False
@@ -1251,7 +1251,10 @@ class MaaManager(QObject):
                 if (
                     "完成任务: Fight" in log
                     or "完成任务: 刷理智" in log
-                    or "剿灭任务失败" in log
+                    or (
+                        self.log_check_mode == "自动代理_剿灭"
+                        and "任务出错: 刷理智" in log
+                    )
                 ):
                     self.task_dict["Combat"] = "False"
                 if "完成任务: Mall" in log or "完成任务: 获取信用及购物" in log:

app/ui/Widget.py

@@ -281,9 +281,9 @@ class NoticeMessageBox(MessageBoxBase):
             super().__init__(parent)
             self.setTitle(title)
 
-            self.Layout = QVBoxLayout()
+            content_widget = QWidget()
-            self.viewLayout.addLayout(self.Layout)
+            self.Layout = QVBoxLayout(content_widget)
-            self.viewLayout.setContentsMargins(3, 0, 3, 3)
+            self.Layout.setContentsMargins(0, 0, 11, 0)
 
             self.index_cards: List[QuantifiedItemCard] = []
 
@@ -301,6 +301,16 @@ class NoticeMessageBox(MessageBoxBase):
 
             self.Layout.addStretch(1)
 
+            scrollArea = ScrollArea()
+            scrollArea.setWidgetResizable(True)
+            scrollArea.setContentsMargins(0, 0, 0, 0)
+            scrollArea.setStyleSheet("background: transparent; border: none;")
+            scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+            scrollArea.setWidget(content_widget)
+
+            self.viewLayout.addWidget(scrollArea)
+            self.viewLayout.setContentsMargins(3, 0, 3, 3)
+
 
 class SettingFlyoutView(FlyoutViewBase):
     """设置卡二级菜单弹出组件"""

app/ui/history.py

@@ -41,7 +41,7 @@ from qfluentwidgets import (
     ZhDatePicker,
     SubtitleLabel,
 )
-from PySide6.QtCore import Signal, QDate
+from PySide6.QtCore import Signal, QDate, Qt
 import os
 import subprocess
 from datetime import datetime, timedelta
@@ -330,10 +330,11 @@ class History(QWidget):
                 def __init__(self, history_list: List[Path], parent=None):
                     super().__init__(parent)
                     self.setTitle("记录条目")
+                    self.setFixedHeight(500)
 
-                    self.Layout = QVBoxLayout()
+                    content_widget = QWidget()
-                    self.viewLayout.addLayout(self.Layout)
+                    self.Layout = QVBoxLayout(content_widget)
-                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                    self.Layout.setContentsMargins(0, 0, 11, 0)
 
                     self.index_cards: List[StatefulItemCard] = []
 
@@ -352,16 +353,27 @@ class History(QWidget):
 
                     self.Layout.addStretch(1)
 
+                    scrollArea = ScrollArea()
+                    scrollArea.setWidgetResizable(True)
+                    scrollArea.setContentsMargins(0, 0, 0, 0)
+                    scrollArea.setStyleSheet("background: transparent; border: none;")
+                    scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+                    scrollArea.setWidget(content_widget)
+
+                    self.viewLayout.addWidget(scrollArea)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+
             class StatisticsCard(HeaderCardWidget):
                 """历史记录统计信息卡片组"""
 
                 def __init__(self, name: str, item_list: list, parent=None):
                     super().__init__(parent)
                     self.setTitle(name)
+                    self.setFixedHeight(500)
 
-                    self.Layout = QVBoxLayout()
+                    content_widget = QWidget()
-                    self.viewLayout.addLayout(self.Layout)
+                    self.Layout = QVBoxLayout(content_widget)
-                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                    self.Layout.setContentsMargins(0, 0, 11, 0)
 
                     self.item_cards: List[QuantifiedItemCard] = []
 
@@ -375,12 +387,23 @@ class History(QWidget):
 
                     self.Layout.addStretch(1)
 
+                    scrollArea = ScrollArea()
+                    scrollArea.setWidgetResizable(True)
+                    scrollArea.setContentsMargins(0, 0, 0, 0)
+                    scrollArea.setStyleSheet("background: transparent; border: none;")
+                    scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+                    scrollArea.setWidget(content_widget)
+
+                    self.viewLayout.addWidget(scrollArea)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+
             class LogCard(HeaderCardWidget):
                 """历史记录日志卡片"""
 
                 def __init__(self, parent=None):
                     super().__init__(parent)
                     self.setTitle("日志")
+                    self.setFixedHeight(500)
 
                     self.text = TextBrowser(self)
                     self.open_file = PushButton("打开日志文件", self)

resources/version.json

@@ -1,6 +1,11 @@
 {
-    "main_version": "4.4.2.0",
+    "main_version": "4.4.3.0",
     "version_info": {
+        "4.4.3.0": {
+            "修复BUG": [
+                "适配 MAA 剿灭关卡任务出错日志"
+            ]
+        },
         "4.4.2.0": {
             "修复BUG": [
                 "修复独立更新器版本号比对问题",