diff --git a/arknights_mower/solvers/base_mixin.py b/arknights_mower/solvers/base_mixin.py index 64baf56c..c3a35f2a 100644 --- a/arknights_mower/solvers/base_mixin.py +++ b/arknights_mower/solvers/base_mixin.py @@ -153,7 +153,7 @@ def profession_filter(self, profession=None): if retry > 5: raise Exception("打开职业筛选失败") retry = 0 - while self.get_color(label_pos_map[profession])[2] != 253: + while self.get_color(label_pos_map[profession])[2] < 250: logger.debug(f"配色为: {self.get_color(label_pos_map[profession])[2]}") self.tap(label_pos_map[profession], 0.1) retry += 1 diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index 4a4ad937..b571db0b 100644 --- a/arknights_mower/solvers/base_schedule.py +++ b/arknights_mower/solvers/base_schedule.py @@ -1741,7 +1741,7 @@ def todo_list(self) -> None: collect = {"bill": "订单", "factory": "制造站产物", "trust": "信赖"} if self.last_execution["todo"] is None or self.last_execution[ "todo" - ] < datetime.now() - timedelta(hours=2): + ] < datetime.now() - timedelta(minutes=30): for res, name in collect.items(): tap_times = 0 while pos := self.find(f"infra_collect_{res}"): @@ -1751,12 +1751,12 @@ def todo_list(self) -> None: tap_times += 1 if tap_times > 0: break - if not tapped: - # 点击右上角的通知图标 - # 可能被产物收取提示挡住,所以直接点位置 - self.tap((1840, 140)) - self.todo_task = True self.last_execution["todo"] = datetime.now() + if not tapped: + # 点击右上角的通知图标 + # 可能被产物收取提示挡住,所以直接点位置 + self.tap((1840, 140)) + self.todo_task = True def clue_new(self): logger.info("基建:线索")