diff --git a/arknights_mower/__init__.py b/arknights_mower/__init__.py index 5f8ea67f..62ce0924 100644 --- a/arknights_mower/__init__.py +++ b/arknights_mower/__init__.py @@ -2,7 +2,7 @@ import sys from pathlib import Path -__version__ = "2024.9.2" +__version__ = "2024.9.4" if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"): __rootdir__ = Path(sys._MEIPASS).joinpath("arknights_mower").resolve() diff --git a/arknights_mower/__main__.py b/arknights_mower/__main__.py index 5e6ffe61..a34a5128 100644 --- a/arknights_mower/__main__.py +++ b/arknights_mower/__main__.py @@ -188,8 +188,11 @@ def simulate(saved): base_scheduler.daily_skland = saved["daily_skland"] base_scheduler.daily_mail = saved["daily_mail"] base_scheduler.task_count = saved["task_count"] + base_scheduler.op_data.skill_upgrade_supports = saved[ + "skill_upgrade_supports" + ] except Exception as ex: - logger.error(ex) + logger.exception(ex) base_scheduler.tasks = tasks while True: try: diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index 84b795db..13213598 100644 --- a/arknights_mower/solvers/base_schedule.py +++ b/arknights_mower/solvers/base_schedule.py @@ -825,7 +825,8 @@ def agent_get_mood(self, skip_dorm=False, force=False): need_read = set( v.room for k, v in self.op_data.operators.items() - if v.need_to_refresh() and v.room in base_room_list + if v.need_to_refresh(0.5 if k in ["歌蕾蒂娅", "见行者"] else 2) + and v.room in base_room_list ) for room in need_read: error_count = 0 diff --git a/arknights_mower/solvers/record.py b/arknights_mower/solvers/record.py index db10214c..38f0e9b6 100644 --- a/arknights_mower/solvers/record.py +++ b/arknights_mower/solvers/record.py @@ -88,6 +88,7 @@ def save_wrapper(*args, **kwargs): "daily_skland": base_scheduler.daily_skland, "daily_mail": base_scheduler.daily_mail, "task_count": base_scheduler.task_count, + "skill_upgrade_supports": base_scheduler.op_data.skill_upgrade_supports, } # Call the original function diff --git a/arknights_mower/utils/operators.py b/arknights_mower/utils/operators.py index e0e5ce5d..697093f1 100644 --- a/arknights_mower/utils/operators.py +++ b/arknights_mower/utils/operators.py @@ -786,7 +786,6 @@ def not_valid(self): else: return False return ( - # 歌蕾蒂娅主班 刷新心情频率提升 self.need_to_refresh(2.5) or self.current_room != self.room or self.index != self.current_index diff --git a/server.py b/server.py index 56fab138..54f8d880 100755 --- a/server.py +++ b/server.py @@ -592,7 +592,7 @@ def get_count(): if len(supports) == 0: raise Exception("请添加专精工具人") base_scheduler.op_data.skill_upgrade_supports = supports - logger.error("更新专精工具人完毕") + logger.info("更新专精工具人完毕") base_scheduler.tasks.append(new_task) logger.debug(f"成功:{str(new_task)}") return "添加任务成功!"