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

Merge pull request #1966 from kunkun008/fix/mysteryshop-blue-buy-more

fix(MysteryShop): 蓝票改用 buy_more,并按单价判断,高于 85 勾玉不买
huangrunheng 3 недель назад
Родитель
Сommit
cc65d55dae

+ 4 - 0
tasks/Component/Buy/assets.py

@@ -30,10 +30,14 @@ class BuyAssets:
 	I_BUY_RMB = RuleImage(roi_front=(610,532,35,32), roi_back=(548,483,178,119), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_rmb.png")
 	# 购买成功 
 	I_BUY_SUCCESS = RuleImage(roi_front=(512,53,261,44), roi_back=(449,0,405,167), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_success.png")
+	# 确认按钮上的勾玉 
+	I_BUY_JADE = RuleImage(roi_front=(604,537,42,52), roi_back=(540,480,200,120), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_jade.png")
 
 
 	# Ocr Rule Assets
 	# Ocr-description 
 	O_BUY_NUMBER = RuleOcr(roi=(578,416,52,71), area=(578,416,52,71), mode="Digit", method="Default", keyword="", name="buy_number")
+	# 确认按钮上的单价, roi 运行时按勾玉图标位置设置 
+	O_BUY_PRICE = RuleOcr(roi=(646,537,60,52), area=(646,537,60,52), mode="Digit", method="Default", keyword="", name="buy_price")
 
 

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

@@ -164,6 +164,171 @@ 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,
+                        max_price: int = None, money: int = None, remain: int = None) -> bool:
+        """
+        购买弹窗可能是单个购买窗口, 也可能是带数量选择(加号)的多数量购买窗口
+        先点开弹窗, 出现加号走 buy_more, 出现单个购买窗口走 buy_one
+        :param start_click: 开始点击
+        :param check_image: 单个购买窗口确认时候的图片
+        :param number: 多数量窗口的购买数量, 不指定就是拉满. 指定 max_price 时不用, 数量按 money 和 remain 算
+        :param max_price: 单价上限, 不为 None 时先读确认按钮上的勾玉单价, 没有勾玉、读不到或超过上限就取消购买
+        :param money: 当前余额, 指定 max_price 时用来算买得起几个
+        :param remain: 剩余购买次数, 指定 max_price 时用来算购买数量
+        :return: 超时没等到任何购买弹窗或取消购买返回 False
+        """
+        timeout = Timer(10).start()
+        while 1:
+            self.screenshot()
+
+            if self.appear(self.I_BUY_PLUS):
+                if max_price is not None:
+                    return self._buy_with_price(start_click, check_image, True, max_price, money, remain)
+                if number == 1:
+                    # buy_more 指定数量时会先点一次加号再 OCR, 买 1 个会变成买 2 个
+                    return self._buy_more_default(start_click)
+                logger.info('Buy window with number selector, use buy_more')
+                return self.buy_more(start_click, number)
+            if self.appear(check_image):
+                if max_price is not None:
+                    return self._buy_with_price(start_click, check_image, False, max_price, money, remain)
+                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_with_price(self, start_click: Union[RuleImage, RuleOcr, RuleClick], check_image: RuleImage,
+                        more: bool, max_price: int, money: int, remain: int) -> bool:
+        """
+        购买弹窗已打开, 读确认按钮上的勾玉单价, 不超过上限才买
+        :param more: True 为多数量购买窗口, False 为单个购买窗口
+        :return: 买到返回 True, 取消购买或达到购买上限返回 False
+        """
+        price = self._buy_read_price()
+        if price is None or price > max_price:
+            logger.warning(f'Buy price {price} is unknown or over max price {max_price}, cancel buy')
+            self._buy_cancel(check_image)
+            return False
+        if not more:
+            logger.info(f'Single buy window, price {price}, buy number 1')
+            return self.buy_one(start_click, check_image)
+        if money is None or remain is None:
+            # 没传余额或剩余次数时只买 1 个
+            number = 1
+        else:
+            number = min(remain, money // price)
+        logger.info(f'Buy price {price}, money {money}, remain {remain}, buy number {number}')
+        if number < 1:
+            logger.warning('Money is not enough to buy one, cancel buy')
+            self._buy_cancel(check_image)
+            return False
+        if number == 1:
+            return self._buy_more_default(start_click)
+        if number == remain:
+            return self.buy_more(start_click, None)
+        # buy_more(start_click, number) 点加号后才读数量, 可能超过 number.
+        # 余额不够买满时每次只买 1 个, 调用方循环会重新读余额和剩余次数再买下一个
+        logger.info(f'Money is not enough to buy all {remain}, buy one by one')
+        return self._buy_more_default(start_click)
+
+    def _buy_read_price(self, min_price: int = 40) -> Union[int, None]:
+        """
+        读购买确认按钮上的勾玉单价: 先等勾玉图标出现, 再读图标右边的数字
+        :param min_price: 单价下限, 低于它当作 OCR 读错(例如 90 少读一位成 9). 默认 40: 蓝票已知最低价 50, 留一点余量
+        :return: 单价, 没有勾玉图标、读不到或低于下限返回 None
+        """
+        jade_timer = Timer(2).start()
+        while 1:
+            if self.appear(self.I_BUY_JADE):
+                break
+            if jade_timer.reached():
+                logger.warning('Jade icon is not found on buy button, maybe not paid by jade')
+                return None
+            self.screenshot()
+        x, y, w, h = self.I_BUY_JADE.roi_front
+        # 只取图标右边, 裁剪框碰到图标会把图标读成 1, 例如 90 读成 190
+        self.O_BUY_PRICE.roi = [x + w, y, 60, h]
+        price = self.O_BUY_PRICE.ocr(self.device.image)
+        try:
+            price = int(price)
+        except (TypeError, ValueError):
+            price = 0
+        if price == 0:
+            # Digit 读不到时返回 0
+            logger.warning('OCR buy price failed')
+            return None
+        if price < min_price:
+            logger.warning(f'Buy price {price} is lower than min price {min_price}, treat as OCR error')
+            return None
+        return price
+
+    def _buy_cancel(self, check_image: RuleImage) -> bool:
+        """
+        点取消关掉购买弹窗, 直到多数量窗口的加号和单个购买窗口的确认图都消失
+        :return: 关掉返回 True, 超时返回 False
+        """
+        timeout = Timer(10).start()
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_BUY_PLUS) and not self.appear(check_image):
+                return True
+            if timeout.reached():
+                logger.warning('Cancel buy window timeout')
+                return False
+            if self.click(self.C_BUY_CANCEL, interval=1):
+                continue
+
+    def _buy_more_default(self, start_click: Union[RuleImage, RuleOcr, RuleClick]) -> bool:
+        """
+        多数量购买窗口不调整数量, 默认数量为 1 时直接确认买 1 个
+        :param start_click: 默认数量不是 1 时退回 buy_more(start_click, 1) 用
+        :return: 买到返回 True, 达到购买上限返回 False
+        """
+        ocr_timer = Timer(2).start()
+        while 1:
+            current = self.O_BUY_NUMBER.ocr(self.device.image)
+            if current == 1:
+                break
+            if ocr_timer.reached():
+                logger.warning(f'Default buy number is {current}, fallback to buy_more')
+                return self.buy_more(start_click, 1)
+            self.screenshot()
+        logger.info('Buy window with number selector, buy one with default number')
+        while 1:
+            self.screenshot()
+
+            if self.ui_reward_appear_click():
+                while 1:
+                    self.screenshot()
+                    # 等待动画结束
+                    if not self.appear(self.I_UI_REWARD, threshold=0.6):
+                        logger.info('Get reward success')
+                        break
+                    # 一直点击
+                    if self.ui_reward_appear_click():
+                        continue
+                return True
+
+            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')
+                return False
+
+            if self.click(self.C_BUY_MORE, interval=2):
+                continue
+
     def buy_check_money(self, target: RuleOcr, minimum: int):
         """
         检查钱是否足够

BIN
tasks/Component/Buy/buy/buy_buy_jade.png


+ 9 - 0
tasks/Component/Buy/buy/image.json

@@ -43,5 +43,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "购买成功"
+  },
+  {
+    "itemName": "buy_jade",
+    "imageName": "buy_buy_jade.png",
+    "roiFront": "604,537,42,52",
+    "roiBack": "540,480,200,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "确认按钮上的勾玉"
   }
 ]

+ 9 - 0
tasks/Component/Buy/buy/ocr.json

@@ -7,5 +7,14 @@
     "method": "Default",
     "keyword": "",
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "buy_price",
+    "roiFront": "646,537,60,52",
+    "roiBack": "646,537,60,52",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "确认按钮上的单价, roi 运行时按勾玉图标位置设置"
   }
 ]

+ 2 - 1
tasks/MysteryShop/script_task.py

@@ -88,7 +88,8 @@ 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,
+                                    max_price=85):
                 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,

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

@@ -32,13 +32,16 @@ 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, max_price: int = None):
         """
         针对只能买一个的
         :param buy_button:
         :param buy_check:
         :param money_ocr:
         :param buy_money: 买这一个花多少
+        :param more_window: 购买弹窗可能是多数量窗口(剩余次数大于1时), 为 True 时按弹窗类型选 buy_more 或 buy_one
+        :param max_price: 单价上限, 不为 None 时从购买弹窗读单价, 超过上限或读不到就不买, 数量按剩余次数和余额算
         :return:
         """
         logger.hr(buy_button.name, 3)
@@ -62,6 +65,14 @@ class FriendshipPoints(Special):
             logger.warning(f'No enough money {current_money}')
             return False
         # 点击购买
+        if max_price is not None:
+            # buy_money 只是余额门槛, 不是单价. 单价从购买弹窗上读, 由 buy_one_or_more 按单价算数量
+            logger.info(f'Money {current_money}, remain {_remain}, max price {max_price}')
+            return self.buy_one_or_more(buy_button, buy_check, max_price=max_price,
+                                        money=current_money, remain=_remain)
+        if more_window:
+            # 不读单价时只买 1 个, 由调用方循环重新检查剩余次数和余额再买
+            return self.buy_one_or_more(buy_button, buy_check, 1)
         return self.buy_one(buy_button, buy_check)
 
     def buy_mall_more(self, buy_button: RuleImage, remain_number: bool, money_ocr: RuleOcr,