fix: improve robustness of agent arrangement (#122)

* fix: improve robustness of agent arrangement issued #121
ArkMowers · Jun 8, 2022 · 6601750 · 6601750
1 parent 4308351
commit 6601750
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/arknights_mower/resources/arrange_empty_room.png b/arknights_mower/resources/arrange_empty_room.png
diff --git a/arknights_mower/solvers/base_construct.py b/arknights_mower/solvers/base_construct.py
@@ -596,12 +596,13 @@ def agent_arrange(self, plan: tp.BasePlan) -> None:
                         y = (block[0][1]+block[2][1])//2
                         self.tap((x, y))
 
-                        # 清空已工作中的干员
-                        if self.find('arrange_clean') is not None:
-                            self.tap_element('arrange_clean')
-                        else:
-                            # 对于只有一个干员的房间，没有清空按钮，需要点击干员清空
-                            self.tap((self.recog.w*0.38, self.recog.h*0.3), interval=0)
+                        # 若不是空房间，则清空工作中的干员
+                        if self.find('arrange_empty_room') is None:
+                            if self.find('arrange_clean') is not None:
+                                self.tap_element('arrange_clean')
+                            else:
+                                # 对于只有一个干员的房间，没有清空按钮，需要点击干员清空
+                                self.tap((self.recog.w*0.38, self.recog.h*0.3), interval=0)
 
                         try:
                             if base_room_list[idx].startswith('dormitory'):