diff --git a/AUTO_MAA.py b/AUTO_MAA.py index 13f9d32..c0baadb 100644 --- a/AUTO_MAA.py +++ b/AUTO_MAA.py @@ -186,7 +186,7 @@ class MaaRunner(QtCore.QThread): log, ) # 判断MAA程序运行状态 - result = self.IfMaaSuccess(log) + result = self.IfMaaSuccess(log, j) if result == "Success!": runbook[j] = True self.UpGui.emit( @@ -252,8 +252,10 @@ class MaaRunner(QtCore.QThread): self.ifRun = False # 判断MAA程序运行状态 - def IfMaaSuccess(self, log): - if "任务已全部完成!" in log: + def IfMaaSuccess(self, log, mode): + if mode == 1 and "任务出错: Fight" in log: + return "检测到MAA未能实际执行任务\n正在中止相关程序\n请等待10s" + elif "任务已全部完成!" in log: return "Success!" elif ( ("请检查连接设置或尝试重启模拟器与 ADB 或重启电脑" in log) diff --git a/更新说明.txt b/更新说明.txt index f28dea4..c0f802e 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,6 +1,6 @@ v3.1.2_Beta ## 修复BUG -- 无 +- 添加对内部任务失败的识别 ## 程序优化 - 优化log文件读取策略,可以读取无时间戳的日志 - 优化MAA运行判定,为后续开发打基础