فهرست منبع

fix(RichMan): Handle bulk purchase failures in special shop

neptine 1 ماه پیش
والد
کامیت
9ec6101e50
2فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 3 2
      tasks/Component/Buy/buy.py
  2. 2 1
      tasks/RichMan/mall/special.py

+ 3 - 2
tasks/Component/Buy/buy.py

@@ -77,7 +77,7 @@ class Buy(BaseTask, BuyAssets):
         return True
         return True
 
 
     def buy_more(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
     def buy_more(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
-                 number: int = None):
+                 number: int = None) -> bool:
         """
         """
         购买多个物品
         购买多个物品
         :param start_click:
         :param start_click:
@@ -93,7 +93,7 @@ class Buy(BaseTask, BuyAssets):
             if try_click_count >= 5:
             if try_click_count >= 5:
                 logger.warning(f'Buy_more failed, try_click_count: {try_click_count}')
                 logger.warning(f'Buy_more failed, try_click_count: {try_click_count}')
                 logger.warning('Close the purchase')
                 logger.warning('Close the purchase')
-                return
+                return False
 
 
             if isinstance(start_click, RuleImage):
             if isinstance(start_click, RuleImage):
                 if self.appear_then_click(start_click, interval=1):
                 if self.appear_then_click(start_click, interval=1):
@@ -162,6 +162,7 @@ class Buy(BaseTask, BuyAssets):
 
 
             if self.click(self.C_BUY_MORE, interval=2):
             if self.click(self.C_BUY_MORE, interval=2):
                 continue
                 continue
+        return True
 
 
     def buy_check_money(self, target: RuleOcr, minimum: int):
     def buy_check_money(self, target: RuleOcr, minimum: int):
         """
         """

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

@@ -137,7 +137,8 @@ class Special(Buy, MallNavbar):
             buy_res_number = buy_number
             buy_res_number = buy_number
         if buy_cycles_number:
         if buy_cycles_number:
             for i in range(buy_cycles_number):
             for i in range(buy_cycles_number):
-                self.buy_more(self.I_SP_BUY_LOW)
+                if not self.buy_more(self.I_SP_BUY_LOW):
+                    return
                 time.sleep(0.5)
                 time.sleep(0.5)
         if buy_res_number:
         if buy_res_number:
             self.buy_more(self.I_SP_BUY_LOW, buy_res_number)
             self.buy_more(self.I_SP_BUY_LOW, buy_res_number)