ソースを参照

feat(rich man): add honor store

runhey 3 年 前
親
コミット
9729a137e0

+ 1 - 1
module/ocr/sub_ocr.py

@@ -96,7 +96,7 @@ class Digit(Single):
     def after_process(self, result):
         result = super().after_process(result)
         result = result.replace('I', '1').replace('D', '0').replace('S', '5')
-        result = result.replace('B', '8')
+        result = result.replace('B', '8').replace('?', '2').replace('?', '2')
         result = [char for char in result if char.isdigit()]
         result = ''.join(result)
 

+ 1 - 1
tasks/RichMan/assets.py

@@ -117,7 +117,7 @@ class RichManAssets:
 	# 杂货铺 
 	I_MALL_SUNDRY = RuleImage(roi_front=(854,623,74,61), roi_back=(854,623,74,61), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
 	# 杂货铺 
-	I_MALL_SUNDRY_CHECK = RuleImage(roi_front=(1169,95,72,440), roi_back=(1169,95,72,440), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry_check.png")
+	I_MALL_SUNDRY_CHECK = RuleImage(roi_front=(1093,10,31,44), roi_back=(1093,10,31,44), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry_check.png")
 
 
 	# Image Rule Assets

+ 69 - 3
tasks/RichMan/mall/honor.py

@@ -8,14 +8,78 @@ from module.logger import logger
 from tasks.GameUi.page import page_main, page_guild
 from tasks.GameUi.game_ui import GameUi
 from tasks.Component.Buy.buy import Buy
-from tasks.RichMan.assets import RichManAssets
+from tasks.RichMan.mall.navbar import MallNavbar
+from tasks.RichMan.mall.special import Special
 from tasks.RichMan.config import HonorRoom
 
 
-class Honor(GameUi, Buy, RichManAssets):
+class Honor(Special):
 
     def execute_honor(self, con: HonorRoom = None):
-        pass
+        if not con:
+            con = self.config.rich_man.honor_room
+        if not con.enable:
+            logger.info('Honor is not enable')
+            return
+        self._enter_honor()
+        self._honor_mystery_amulet(con.mystery_amulet)
+        self._honor_black_daruma_scrap(con.black_daruma_scrap)
+
+
+    def _honor_mystery_amulet(self, enable: bool=False):
+        logger.hr('Buy mystery amulet', 3)
+        if not enable:
+            logger.info('Buy mystery amulet is disabled')
+            return
+
+        self.screenshot()
+        if not self.appear(self.I_HONOR_BLUE):
+            logger.warning('No appear mystery amulet')
+            return
+        # 检查剩余数量
+        # remain_number = self.O_HONOR_BLUE.ocr(self.device.image)
+        remain_number = self._special_check_remain(self.I_HONOR_BLUE)
+        if not isinstance(remain_number, int):
+            logger.warning('Can not get remain number')
+            return
+        if remain_number == 0:
+            logger.warning(f'No blue honor {remain_number}')
+            return
+        if not self.mall_check_money(4, 1500):
+            logger.warning('No enough money')
+            return
+        # 点击购买
+        self.buy_more(self.I_HONOR_BLUE)
+        time.sleep(1)
+
+    def _honor_black_daruma_scrap(self, enable: bool=False):
+        logger.hr('Buy black daruma scrap', 3)
+        if not enable:
+            logger.info('Buy black daruma scrap is disabled')
+            return
+
+        self.screenshot()
+        if not self.appear(self.I_HONOR_BLACK):
+            logger.warning('No appear black daruma scrap')
+            return
+        # 检查剩余数量
+        # remain_number = self.O_HONOR_BLACK.ocr(self.device.image)
+        remain_number = self._special_check_remain(self.I_HONOR_BLACK)
+        if not isinstance(remain_number, int):
+            logger.warning('Can not get remain number')
+            return
+        if remain_number == 0:
+            logger.warning(f'No black daruma scrap {remain_number}')
+            return
+        if not self.mall_check_money(4, 540):
+            logger.warning('No enough money')
+            return
+        # 点击购买
+        self.buy_more(self.I_HONOR_BLACK)
+        time.sleep(0.5)
+
+
+
 
 
 if __name__ == '__main__':
@@ -26,6 +90,8 @@ if __name__ == '__main__':
     d = Device(c)
     t = Honor(c, d)
 
+    t.execute_honor()
+
 
 
 

+ 2 - 2
tasks/RichMan/mall/navbar/image_bottom.json

@@ -74,8 +74,8 @@
   {
     "itemName": "mall_sundry_check",
     "imageName": "navbar_mall_sundry_check.png",
-    "roiFront": "1169,95,72,440",
-    "roiBack": "1169,95,72,440",
+    "roiFront": "1093,10,31,44",
+    "roiBack": "1093,10,31,44",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "杂货铺"

BIN
tasks/RichMan/mall/navbar/navbar_mall_sundry_check.png


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

@@ -161,6 +161,7 @@ class Special(MallNavbar, Buy):
         # logger.info(f'上中点是:{upper_midpoint}')
         # logger.info(f'数字的ROI是: {self.O_SP_RES_NUMBER.roi}')
         result = self.O_SP_RES_NUMBER.ocr(self.device.image)
+        result = result.replace('?', '2').replace('?', '2')
         try:
             result = re.findall(r'\d+', result)[0]
             result = int(result)