Fix: 修复了一堆bug

- 修复了上一场战斗的队伍位置信息会保留到下一场战斗的问题
- 修复了领取大量任务时, 不会等待的问题
- 修复了不计算BOSS队心情消耗的问题
- 增加了碰磁BOSS所有刷新点的方法
- 修复了没有检测到BOSS时停滞的问题
- 修复了处理夜间委托
- 修复了丢失地图信息补全不起作用的问题
- 修复了换装滑动失败后, 陷入死循环的问题
- 删除了微层混合AB图的一些多余逻辑
- 7-2现在会优先捡全部问号了, 不需要先捡附近的来减少行走距离.

module/equipment/assets.py

@@ -15,3 +15,4 @@ FLEET_NEXT = Button(area=(1234, 327, 1254, 356), color=(72, 93, 125), button=(12
 FLEET_PREV = Button(area=(26, 327, 46, 356), color=(72, 93, 125), button=(26, 327, 46, 356), file='./assets/equipment/FLEET_PREV.png')
 OCR_FLEET_INDEX = Button(area=(958, 124, 984, 155), color=(46, 72, 117), button=(958, 124, 984, 155), file='./assets/equipment/OCR_FLEET_INDEX.png')
 SWIPE_AREA = Button(area=(220, 167, 580, 527), color=(165, 172, 194), button=(220, 167, 580, 527), file='./assets/equipment/SWIPE_AREA.png')
+SWIPE_CHECK = Button(area=(190, 353, 610, 455), color=(171, 180, 198), button=(190, 353, 610, 455), file='./assets/equipment/SWIPE_CHECK.png')

module/equipment/equipment.py

@@ -4,22 +4,33 @@ from module.handler.info_bar import InfoBarHandler
 from module.logger import logger
 from module.ui.assets import BACK_ARROW
 
-SWIPE_DISTANCE = (350, 0)
+SWIPE_DISTANCE = 250
 SWIPE_RANDOM_RANGE = (-40, -20, 40, 20)
 
 
 class Equipment(InfoBarHandler):
     equipment_has_take_on = False
 
+    def _view_swipe(self, distance):
+        while 1:
+            SWIPE_CHECK.load_color(self.device.image)
+            self.device.swipe(vector=(distance, 0), box=SWIPE_AREA.area, random_range=SWIPE_RANDOM_RANGE,
+                              padding=0, duration=(0.1, 0.12))
+            while 1:
+                self.device.screenshot()
+                if SWIPE_CHECK.match(self.device.image):
+                    continue
+                if self.appear(EQUIPMENT_OPEN):
+                    break
+
+            if not SWIPE_CHECK.match(self.device.image):
+                break
+
     def _view_next(self):
-        self.device.swipe(vector=(-SWIPE_DISTANCE[0], 0), box=SWIPE_AREA.area, random_range=SWIPE_RANDOM_RANGE,
-                          padding=0, duration=(0.1, 0.12))
-        self.wait_until_appear(EQUIPMENT_OPEN)
+        self._view_swipe(distance=-SWIPE_DISTANCE)
 
     def _view_prev(self):
-        self.device.swipe(vector=(SWIPE_DISTANCE[0], 0), box=SWIPE_AREA.area, random_range=SWIPE_RANDOM_RANGE,
-                          padding=0, duration=(0.1, 0.12))
-        self.wait_until_appear(EQUIPMENT_OPEN)
+        self._view_swipe(distance=SWIPE_DISTANCE)
 
     def _equip_enter(self, enter):
         enter_timer = Timer(5)