Просмотр исходного кода

每日召唤 增加票数判断(愿礼)

liujx54704 1 год назад
Родитель
Сommit
649cbe8fbf
1 измененных файлов с 36 добавлено и 31 удалено
  1. 36 31
      tasks/Component/Summon/summon.py

+ 36 - 31
tasks/Component/Summon/summon.py

@@ -39,39 +39,44 @@ class Summon(BaseTask, SummonAssets):
         """
         logger.info('Summon one')
         self.wait_until_appear(self.I_BLUE_TICKET)
-        ticket_info = self.O_ONE_TICKET.ocr(self.device.image)
-        if '1' not in ticket_info:
-            logger.warning('There is no any one blue ticket')
-            return
-        # 某些情况下滑动异常
-        self.S_RANDOM_SWIPE_1.name = 'S_RANDOM_SWIPE'
-        self.S_RANDOM_SWIPE_2.name = 'S_RANDOM_SWIPE'
-        self.S_RANDOM_SWIPE_3.name = 'S_RANDOM_SWIPE'
-        self.S_RANDOM_SWIPE_4.name = 'S_RANDOM_SWIPE'
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_ONE_TICKET):
-                break
-            if self.appear_then_click(self.I_BLUE_TICKET, interval=1):
-                continue
+        while True:
+            ticket_info = self.O_ONE_TICKET.ocr(self.device.image)
+            if ticket_info is None:
+                ticket_info = 0
+            else:
+                ticket_info = int(ticket_info)
+            if ticket_info <= 0:
+                logger.warning('There is no any one blue ticket')
+                return
+            # 某些情况下滑动异常
+            self.S_RANDOM_SWIPE_1.name = 'S_RANDOM_SWIPE'
+            self.S_RANDOM_SWIPE_2.name = 'S_RANDOM_SWIPE'
+            self.S_RANDOM_SWIPE_3.name = 'S_RANDOM_SWIPE'
+            self.S_RANDOM_SWIPE_4.name = 'S_RANDOM_SWIPE'
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_ONE_TICKET):
+                    break
+                if self.appear_then_click(self.I_BLUE_TICKET, interval=1):
+                    continue
 
-        # 画一张票
-        time.sleep(0.5)
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_SM_CONFIRM, interval=0.6):
-                self.ui_click_until_disappear(self.I_SM_CONFIRM)
-                break
-            if self.appear(self.I_SM_CONFIRM_2, interval=0.6):
-                self.ui_click_until_disappear(self.I_SM_CONFIRM_2)
-                break
-            if self.appear(self.I_ONE_TICKET, interval=1):
-                # 某些时候会点击到 “语言召唤”
-                if self.appear_then_click(self.I_UI_CANCEL, interval=0.8):
+            # 画一张票
+            time.sleep(0.5)
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_SM_CONFIRM, interval=0.6):
+                    self.ui_click_until_disappear(self.I_SM_CONFIRM)
+                    break
+                if self.appear(self.I_SM_CONFIRM_2, interval=0.6):
+                    self.ui_click_until_disappear(self.I_SM_CONFIRM_2)
+                    break
+                if self.appear(self.I_ONE_TICKET, interval=1):
+                    # 某些时候会点击到 “语言召唤”
+                    if self.appear_then_click(self.I_UI_CANCEL, interval=0.8):
+                        continue
+                    self.summon()
                     continue
-                self.summon()
-                continue
-        logger.info('Summon one success')
+            logger.info('Summon one success')
 
 
     def back_summon_main(self):