diff --git a/arknights_mower/__main__.py b/arknights_mower/__main__.py index 88613de95..49331c756 100644 --- a/arknights_mower/__main__.py +++ b/arknights_mower/__main__.py @@ -359,6 +359,23 @@ def simulate(): ) base_scheduler.send_message(body, subject, "html") base_scheduler.maa_plan_solver() + else: + remaining_time = (base_scheduler.tasks[0].time - datetime.now()).total_seconds() + subject = f"休息 {format_time(remaining_time)},到{base_scheduler.tasks[0].time.strftime('%H:%M:%S')}开始工作" + context = f"下一次任务:{base_scheduler.tasks[0].plan if len(base_scheduler.tasks[0].plan) != 0 else '空任务' if base_scheduler.tasks[0].type == '' else base_scheduler.tasks[0].type}" + logger.info(context) + logger.info(subject) + base_scheduler.task_count += 1 + logger.info(f"第{base_scheduler.task_count}次任务结束") + if remaining_time > 0: + if remaining_time > 300: + if base_scheduler.close_simulator_when_idle: + restart_simulator(base_scheduler.simulator, start=False) + elif base_scheduler.exit_game_when_idle: + base_scheduler.device.exit() + time.sleep(remaining_time) + if base_scheduler.close_simulator_when_idle: + restart_simulator(base_scheduler.simulator, stop=False) elif sleep_time > 0: subject = f"休息 {format_time(remaining_time)},到{base_scheduler.tasks[0].time.strftime('%H:%M:%S')}开始工作" context = f"下一次任务:{base_scheduler.tasks[0].plan}" diff --git a/arknights_mower/resources/riic_lmb.png b/arknights_mower/resources/riic_lmb.png index 40e977762..16bd2ccad 100644 Binary files a/arknights_mower/resources/riic_lmb.png and b/arknights_mower/resources/riic_lmb.png differ diff --git a/arknights_mower/resources/riic_return.png b/arknights_mower/resources/riic_return.png index 4e4d19a97..2679c7c1f 100644 Binary files a/arknights_mower/resources/riic_return.png and b/arknights_mower/resources/riic_return.png differ diff --git a/arknights_mower/solvers/report.py b/arknights_mower/solvers/report.py index d9fce2ded..ceea6a33a 100644 --- a/arknights_mower/solvers/report.py +++ b/arknights_mower/solvers/report.py @@ -145,7 +145,7 @@ def read_report(self): # 整理数据 for item in self.report_res: - if self.report_res[item] == 'o' or self.report_res[item] == 'O': + if self.report_res[item] == 'o' or self.report_res[item] == 'O' or self.report_res[item] == 'Q': self.report_res[item] = '0' if item != 'riic_date': res = re.sub("\D", "", self.report_res[item])