diff --git a/app/core/config.py b/app/core/config.py index fa2dede..39c53a3 100644 --- a/app/core/config.py +++ b/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() diff --git a/app/models/MAA.py b/app/models/MAA.py index 509552e..28f49ab 100644 --- a/app/models/MAA.py +++ b/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: diff --git a/resources/version.json b/resources/version.json index 970e704..d88a9df 100644 --- a/resources/version.json +++ b/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": [ "修复独立更新器版本号比对问题",