Sfoglia il codice sorgente

fix(MysteryShop): 蓝票多数量购买窗口改用 buy_more

剩余次数大于1时点蓝票弹出的是带加号的多数量窗口, buy_one 一直等单个窗口导致卡死(GameStuckError)。新增 Buy.buy_one_or_more 按弹窗类型分流(出现加号走 buy_more, 出现单个窗口走 buy_one, 10s 超时返回 False), buy_mall_one 新增可选参数 more_window(默认 False 不影响其他调用), 只对蓝票开启。参考 #1761 (43ada9d1) 荣誉商店蓝票改用 buy_more。
kunkun008 3 settimane fa
parent
commit
120c881a3a

+ 34 - 0
tasks/Component/Buy/buy.py

@@ -164,6 +164,40 @@ class Buy(BaseTask, BuyAssets):
                 continue
         return True
 
+    def buy_one_or_more(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
+                        check_image: RuleImage, number: int = None) -> bool:
+        """
+        购买弹窗可能是单个购买窗口, 也可能是带数量选择(加号)的多数量购买窗口
+        先点开弹窗, 出现加号走 buy_more, 出现单个购买窗口走 buy_one
+        :param start_click: 开始点击
+        :param check_image: 单个购买窗口确认时候的图片
+        :param number: 多数量窗口的购买数量, 不指定就是拉满
+        :return: 超时没等到任何购买弹窗返回 False
+        """
+        timeout = Timer(10).start()
+        while 1:
+            self.screenshot()
+
+            if self.appear(self.I_BUY_PLUS):
+                logger.info('Buy window with number selector, use buy_more')
+                return self.buy_more(start_click, number)
+            if self.appear(check_image):
+                logger.info('Single buy window, use buy_one')
+                return self.buy_one(start_click, check_image)
+            if timeout.reached():
+                logger.warning('Wait buy window timeout')
+                return False
+
+            if isinstance(start_click, RuleImage):
+                if self.appear_then_click(start_click, interval=1):
+                    continue
+            elif isinstance(start_click, RuleOcr):
+                if self.ocr_appear_click(start_click, interval=1):
+                    continue
+            elif isinstance(start_click, RuleClick):
+                if self.click(start_click, interval=1):
+                    continue
+
     def buy_check_money(self, target: RuleOcr, minimum: int):
         """
         检查钱是否足够

+ 1 - 1
tasks/MysteryShop/script_task.py

@@ -88,7 +88,7 @@ class ScriptTask(FriendshipPoints, MysteryShopAssets, GeneralInvite):
         """
         if shop_config.mystery_amulet:
             while self.buy_mall_one(buy_button=self.I_MS_BLUE, buy_check=self.I_MS_CHECK_BLUE,
-                                    money_ocr=self.O_MALL_RESOURCE_5, buy_money=85):
+                                    money_ocr=self.O_MALL_RESOURCE_5, buy_money=85, more_window=True):
                 pass
         if shop_config.black_daruma_scrap:
             while self.buy_mall_one(buy_button=self.I_MS_BLACK, buy_check=self.I_MS_CHECK_BLACK,

+ 7 - 1
tasks/RichMan/mall/friendship_points.py

@@ -32,13 +32,15 @@ class FriendshipPoints(Special):
             self.buy_mall_more(buy_button=self.I_FS_BROKEN, remain_number=False, money_ocr=self.I_MALL_RESOURCE_FRIENDS.build_mall_resource_ocr(self.device.image),
                                buy_number=con.broken_amulet, buy_max=99, buy_money=100)
 
-    def buy_mall_one(self, buy_button: RuleImage, buy_check: RuleImage, money_ocr: RuleOcr, buy_money: int):
+    def buy_mall_one(self, buy_button: RuleImage, buy_check: RuleImage, money_ocr: RuleOcr, buy_money: int,
+                     more_window: bool = False):
         """
         针对只能买一个的
         :param buy_button:
         :param buy_check:
         :param money_ocr:
         :param buy_money: 买这一个花多少
+        :param more_window: 购买弹窗可能是多数量窗口(剩余次数大于1时), 为 True 时按弹窗类型选 buy_more 或 buy_one
         :return:
         """
         logger.hr(buy_button.name, 3)
@@ -62,6 +64,10 @@ class FriendshipPoints(Special):
             logger.warning(f'No enough money {current_money}')
             return False
         # 点击购买
+        if more_window:
+            # 钱不够买满剩余数量时, 只买得起的数量
+            number = None if current_money >= buy_money * _remain else current_money // buy_money
+            return self.buy_one_or_more(buy_button, buy_check, number)
         return self.buy_one(buy_button, buy_check)
 
     def buy_mall_more(self, buy_button: RuleImage, remain_number: bool, money_ocr: RuleOcr,