From 9ad1ff90b09f7f3b7f18cb9662555661c1750a2d Mon Sep 17 00:00:00 2001 From: Shawnsdaddy Date: Thu, 4 Jan 2024 00:41:31 -0800 Subject: [PATCH] =?UTF-8?q?#458=20=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/solvers/base_schedule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index a5e580c4b..dbb0cd852 100644 --- 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 为识别错误