浏览代码

Merge pull request #254 from yEs1do/feature7

经验 50 buff 下拉查找
huangrunheng 2 年之前
父节点
当前提交
3a2c097624
共有 1 个文件被更改,包括 17 次插入 和 9 次删除
  1. 17 9
      tasks/Component/GeneralBuff/general_buff.py

+ 17 - 9
tasks/Component/GeneralBuff/general_buff.py

@@ -90,7 +90,7 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         self.screenshot()
         self.screenshot()
         area = self.get_area(self.device.image, self.O_GOLD_50)
         area = self.get_area(self.device.image, self.O_GOLD_50)
         if not area:
         if not area:
-            logger.warning('No gold 100 buff')
+            logger.warning('No gold 50 buff')
             return None
             return None
         self.I_OPEN_YELLOW.roi_back = list(area)  # 动态设置roi
         self.I_OPEN_YELLOW.roi_back = list(area)  # 动态设置roi
         self.I_CLOSE_RED.roi_back = list(area)
         self.I_CLOSE_RED.roi_back = list(area)
@@ -145,13 +145,21 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         :return:
         :return:
         """
         """
         logger.info('Exp 50 buff')
         logger.info('Exp 50 buff')
-        self.screenshot()
-        area = self.get_area(self.device.image, self.O_EXP_50)
-        if not area:
-            logger.warning('No gold 100 buff')
-            return None
-        self.I_OPEN_YELLOW.roi_back = list(area)
-        self.I_CLOSE_RED.roi_back = list(area)
+        while 1:
+            self.screenshot()
+            area = self.get_area(self.device.image, self.O_EXP_50)
+            if not area:
+                logger.warning('No exp 50 buff')
+                continue
+            self.set_switch_area(area)
+
+            if not self.appear(self.I_OPEN_YELLOW) and not self.appear(self.I_CLOSE_RED):
+                logger.info('No exp 50 buff')
+                self.device.swipe(p2=(530, 240), p1=(580, 320))
+                time.sleep(1)
+            else:
+                break
+
         if is_open:
         if is_open:
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
@@ -178,7 +186,7 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
             self.screenshot()
             self.screenshot()
             area = self.get_area(self.device.image, self.O_EXP_100)
             area = self.get_area(self.device.image, self.O_EXP_100)
             if not area:
             if not area:
-                logger.warning('No gold 100 buff')
+                logger.warning('No exp 100 buff')
                 continue
                 continue
             self.set_switch_area(area)
             self.set_switch_area(area)