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

fix(RichMan): Continue to execute when the purchase item reaches the upper limit

ryland 2 лет назад
Родитель
Сommit
c67848b8a7
2 измененных файлов с 8 добавлено и 11 удалено
  1. 6 1
      tasks/Component/Buy/buy.py
  2. 2 10
      tasks/RichMan/mall/special.py

+ 6 - 1
tasks/Component/Buy/buy.py

@@ -133,7 +133,6 @@ class Buy(BaseTask, BuyAssets):
                         break
                         break
                     number_record.pop(0)
                     number_record.pop(0)
 
 
-
         # 购买确认
         # 购买确认
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
@@ -151,6 +150,12 @@ class Buy(BaseTask, BuyAssets):
                         continue
                         continue
                 break
                 break
 
 
+            # 如果这个购买已达上限
+            if self.appear(self.I_UI_CONFIRM_SAMLL):
+                self.ui_click_until_disappear(self.I_UI_CONFIRM_SAMLL, interval=1)
+                logger.warning('Buy number limit')
+                break
+
             if self.click(self.C_BUY_MORE, interval=2):
             if self.click(self.C_BUY_MORE, interval=2):
                 continue
                 continue
 
 

+ 2 - 10
tasks/RichMan/mall/special.py

@@ -49,7 +49,7 @@ class Special(Buy, MallNavbar):
             if self.swipe(self.S_SP_DOWN, interval=2):
             if self.swipe(self.S_SP_DOWN, interval=2):
                 time.sleep(2)
                 time.sleep(2)
 
 
-    def _special_totom(self, totem_pass:bool):
+    def _special_totom(self, totem_pass: bool):
         """
         """
         购买御灵,要求必须下滑出现御灵
         购买御灵,要求必须下滑出现御灵
         :return:
         :return:
@@ -108,7 +108,6 @@ class Special(Buy, MallNavbar):
             self.buy_more(self.I_SP_BUY_MEDIUM, buy_res_number)
             self.buy_more(self.I_SP_BUY_MEDIUM, buy_res_number)
             time.sleep(0.5)
             time.sleep(0.5)
 
 
-
     def _special_low(self, buy_number: int = 10):
     def _special_low(self, buy_number: int = 10):
         """
         """
         购买低级盘,要求必须下滑出现低级盘
         购买低级盘,要求必须下滑出现低级盘
@@ -144,8 +143,6 @@ class Special(Buy, MallNavbar):
             self.buy_more(self.I_SP_BUY_LOW, buy_res_number)
             self.buy_more(self.I_SP_BUY_LOW, buy_res_number)
             time.sleep(0.5)
             time.sleep(0.5)
 
 
-
-
     def _special_check_remain(self, target: RuleImage):
     def _special_check_remain(self, target: RuleImage):
         """
         """
         检查这个种类的剩余, 要求必须这个出现在当前的页面
         检查这个种类的剩余, 要求必须这个出现在当前的页面
@@ -155,7 +152,7 @@ class Special(Buy, MallNavbar):
         upper_midpoint = target.roi_front[0] + target.roi_front[2] // 2, target.roi_front[1]
         upper_midpoint = target.roi_front[0] + target.roi_front[2] // 2, target.roi_front[1]
         # 重设roi
         # 重设roi
         roi = self.O_SP_RES_NUMBER.roi
         roi = self.O_SP_RES_NUMBER.roi
-        self.O_SP_RES_NUMBER.roi[0] = upper_midpoint[0] - roi[2]//2
+        self.O_SP_RES_NUMBER.roi[0] = upper_midpoint[0] - roi[2] // 2
         self.O_SP_RES_NUMBER.roi[1] = upper_midpoint[1] - roi[3]
         self.O_SP_RES_NUMBER.roi[1] = upper_midpoint[1] - roi[3]
         # logger.info(f'图片的ROI是: {target.roi_front}')
         # logger.info(f'图片的ROI是: {target.roi_front}')
         # logger.info(f'上中点是:{upper_midpoint}')
         # logger.info(f'上中点是:{upper_midpoint}')
@@ -184,8 +181,3 @@ if __name__ == '__main__':
     t = Special(c, d)
     t = Special(c, d)
 
 
     t.execute_special()
     t.execute_special()
-
-
-
-
-