#458 逻辑修复

ArkMowers · Jan 4, 2024 · 9ad1ff9 · 9ad1ff9
1 parent 2e274b0
commit 9ad1ff9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py
@@ -1373,7 +1373,7 @@ def drone(self, room: str, not_customize=False, not_return=False, adjust_time=Fa
                         return
                 self.recog.update()
                 self.recog.save_screencap('run_order')
-                if self.drone_room is not None or room not in self.op_data.run_order_rooms:
+                if self.drone_room is not None or self.drone_room not in self.op_data.run_order_rooms:
                     break
                 if not_customize:
                     drone_count = self.digit_reader.get_drone(self.recog.gray)
@@ -1970,7 +1970,7 @@ def agent_arrange(self, plan: tp.BasePlan, get_time=False):
                 # 接受当前订单
                 while self.find("order_ready", scope=((450, 675), (600, 750))) is not None:
                     self.tap((self.recog.w * 0.25, self.recog.h * 0.25), interval=0.5)
-                if self.drone_room is None or room in self.op_data.run_order_rooms:
+                if self.drone_room is None or (self.drone_room == room and room in self.op_data.run_order_rooms):
                     drone_count = self.digit_reader.get_drone(self.recog.gray)
                     logger.info(f'当前无人机数量为：{drone_count}')
                     # 200 为识别错误