From c8b342ba01fe5c2e03692da1f917e78e1e02879c Mon Sep 17 00:00:00 2001 From: DLmaster Date: Sat, 12 Apr 2025 19:03:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E4=BF=AE=E5=A4=8D=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 2 +- app/core/__init__.py | 2 +- app/core/config.py | 4 ++-- app/core/main_info_bar.py | 10 +++++----- app/core/task_manager.py | 2 +- app/core/timer.py | 2 +- app/models/MAA.py | 2 +- app/models/__init__.py | 2 +- app/services/__init__.py | 2 +- app/services/notification.py | 2 +- app/services/security.py | 2 +- app/services/system.py | 2 +- app/ui/Widget.py | 2 +- app/ui/__init__.py | 2 +- app/ui/dispatch_center.py | 2 +- app/ui/history.py | 2 +- app/ui/home.py | 2 +- app/ui/main_window.py | 2 +- app/ui/member_manager.py | 2 +- app/ui/queue_manager.py | 2 +- app/ui/setting.py | 5 ++++- app/utils/__init__.py | 2 +- app/utils/downloader.py | 3 +++ app/utils/package.py | 5 ++++- main.py | 2 +- 25 files changed, 38 insertions(+), 29 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 1e72259..73f79f6 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA主程序包 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/core/__init__.py b/app/core/__init__.py index 436cb39..b4b072b 100644 --- a/app/core/__init__.py +++ b/app/core/__init__.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA核心组件包 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/core/config.py b/app/core/config.py index f35621b..45ab5a0 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA配置管理 -v4.2 +v4.3 作者：DLmaster_361 """ @@ -599,7 +599,7 @@ class MaaUserConfig(QConfig): class AppConfig(GlobalConfig): - VERSION = "4.2.5.10" + VERSION = "4.3.0.0" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/app/core/main_info_bar.py b/app/core/main_info_bar.py index aed883b..5ed7acc 100644 --- a/app/core/main_info_bar.py +++ b/app/core/main_info_bar.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA信息通知栏 -v4.2 +v4.3 作者：DLmaster_361 """ @@ -45,15 +45,15 @@ class _MainInfoBar: if self.main_window is None: logger.error("信息通知栏未设置父窗口") return None - + # 定义模式到 InfoBar 方法的映射 mode_mapping = { "success": InfoBar.success, "warning": InfoBar.warning, "error": InfoBar.error, - "info": InfoBar.info + "info": InfoBar.info, } - + # 根据 mode 获取对应的 InfoBar 方法 info_bar_method = mode_mapping.get(mode) if info_bar_method: @@ -64,7 +64,7 @@ class _MainInfoBar: isClosable=True, position=InfoBarPosition.TOP_RIGHT, duration=time, - parent=self.main_window + parent=self.main_window, ) else: logger.error(f"未知的通知栏模式: {mode}") diff --git a/app/core/task_manager.py b/app/core/task_manager.py index 7f6b830..a6dedf9 100644 --- a/app/core/task_manager.py +++ b/app/core/task_manager.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA业务调度器 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/core/timer.py b/app/core/timer.py index 66cc434..bb9fd53 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA主业务定时器 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/models/MAA.py b/app/models/MAA.py index c5a01e9..9c8ad57 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -21,7 +21,7 @@ """ AUTO_MAA MAA功能组件 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/models/__init__.py b/app/models/__init__.py index 9fe8ae0..12a6c87 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA模组包 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/services/__init__.py b/app/services/__init__.py index 7c0349d..0c7d938 100644 --- a/app/services/__init__.py +++ b/app/services/__init__.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA服务包 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/services/notification.py b/app/services/notification.py index 1458c39..915f237 100644 --- a/app/services/notification.py +++ b/app/services/notification.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA通知服务 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/services/security.py b/app/services/security.py index 162d58c..c20e743 100644 --- a/app/services/security.py +++ b/app/services/security.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA安全服务 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/services/system.py b/app/services/system.py index 1e2f793..c7e3af8 100644 --- a/app/services/system.py +++ b/app/services/system.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA系统服务 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/Widget.py b/app/ui/Widget.py index e0cda7b..2d29405 100644 --- a/app/ui/Widget.py +++ b/app/ui/Widget.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA组件 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/__init__.py b/app/ui/__init__.py index 419aac6..231c307 100644 --- a/app/ui/__init__.py +++ b/app/ui/__init__.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA图形化界面包 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/dispatch_center.py b/app/ui/dispatch_center.py index a4928b6..657cbc7 100644 --- a/app/ui/dispatch_center.py +++ b/app/ui/dispatch_center.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA调度中枢界面 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/history.py b/app/ui/history.py index 49d4d16..067542c 100644 --- a/app/ui/history.py +++ b/app/ui/history.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA历史记录界面 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/home.py b/app/ui/home.py index 3586740..cbfb11a 100644 --- a/app/ui/home.py +++ b/app/ui/home.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA主界面 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/main_window.py b/app/ui/main_window.py index 309a0b0..e558e32 100644 --- a/app/ui/main_window.py +++ b/app/ui/main_window.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA主界面 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index d28815a..c19c6f4 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA脚本管理界面 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/queue_manager.py b/app/ui/queue_manager.py index ed24bbd..1982eab 100644 --- a/app/ui/queue_manager.py +++ b/app/ui/queue_manager.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA调度队列界面 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/ui/setting.py b/app/ui/setting.py index abe5100..edb4053 100644 --- a/app/ui/setting.py +++ b/app/ui/setting.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA设置界面 -v4.2 +v4.3 作者：DLmaster_361 """ @@ -1053,6 +1053,9 @@ class OtherSettingCard(HeaderCardWidget): def version_text(version_numb: list) -> str: """将版本号列表转为可读的文本信息""" + while len(version_numb) < 4: + version_numb.append(0) + if version_numb[3] == 0: version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}" else: diff --git a/app/utils/__init__.py b/app/utils/__init__.py index 5050f6e..96c2ba5 100644 --- a/app/utils/__init__.py +++ b/app/utils/__init__.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA工具包 -v4.2 +v4.3 作者：DLmaster_361 """ diff --git a/app/utils/downloader.py b/app/utils/downloader.py index d02e6bc..f35994d 100644 --- a/app/utils/downloader.py +++ b/app/utils/downloader.py @@ -53,6 +53,9 @@ from typing import List, Dict, Union def version_text(version_numb: list) -> str: """将版本号列表转为可读的文本信息""" + while len(version_numb) < 4: + version_numb.append(0) + if version_numb[3] == 0: version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}" else: diff --git a/app/utils/package.py b/app/utils/package.py index 6c9c706..1bb58a5 100644 --- a/app/utils/package.py +++ b/app/utils/package.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA打包程序 -v4.2 +v4.3 作者：DLmaster_361 """ @@ -35,6 +35,9 @@ from pathlib import Path def version_text(version_numb: list) -> str: """将版本号列表转为可读的文本信息""" + while len(version_numb) < 4: + version_numb.append(0) + if version_numb[3] == 0: version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}" else: diff --git a/main.py b/main.py index 6e557e4..f7a707a 100644 --- a/main.py +++ b/main.py @@ -21,7 +21,7 @@ """ AUTO_MAA AUTO_MAA主程序 -v4.2 +v4.3 作者：DLmaster_361 """