فهرست منبع

Merge pull request #1351 from migsmiku/dev

修复大富翁
huangrunheng 9 ماه پیش
والد
کامیت
f98bf95920
25فایلهای تغییر یافته به همراه221 افزوده شده و 58 حذف شده
  1. 91 0
      module/atom/RuleImageMallResourceMixin.py
  2. 2 2
      module/atom/image.py
  3. 28 16
      module/atom/ocr.py
  4. 24 11
      tasks/RichMan/assets.py
  5. 2 2
      tasks/RichMan/mall/charisma.py
  6. 4 4
      tasks/RichMan/mall/friendship_points.py
  7. 4 4
      tasks/RichMan/mall/medal.py
  8. 47 0
      tasks/RichMan/mall/navbar/image_mall_resource.json
  9. 9 9
      tasks/RichMan/mall/navbar/image_side.json
  10. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_ap.png
  11. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_charisma.png
  12. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_friends.png
  13. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_honor.png
  14. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_medal.png
  15. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_charisma.png
  16. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_friends.png
  17. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_honor.png
  18. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_medal.png
  19. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_special.png
  20. BIN
      tasks/RichMan/mall/navbar/navbar_side_suer_honor.png
  21. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png
  22. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_friends.png
  23. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_medal.png
  24. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_special.png
  25. 10 10
      tasks/RichMan/mall/navbar/ocr.json

+ 91 - 0
module/atom/RuleImageMallResourceMixin.py

@@ -0,0 +1,91 @@
+# module/atom/image/image_mall_resource.py
+
+from module.logger import logger
+from module.atom.ocr import RuleOcr
+
+
+class RuleImageMallResourceMixin:
+    """
+    RuleImage 的 mall_resource 能力扩展
+    """
+
+    # mall_resource 专用偏移参数
+    MALL_RESOURCE_X_OFFSET = 40
+    MALL_RESOURCE_RIGHT_EXTEND = 70
+
+    def match_and_get_roi(self, image, threshold=None):
+        """
+        - match 成功 → 返回 (x, y, w, h)
+        - match 失败 / 异常 → 返回 None
+        """
+        try:
+            ok = self.match(image, threshold)
+        except Exception as e:
+            logger.error(f"match exception: {e}")
+            return None
+
+        if not ok:
+            return None
+
+        try:
+            mat = self.image
+            if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
+                return None
+
+            h, w = mat.shape[:2]
+            x = int(self.roi_front[0])
+            y = int(self.roi_front[1])
+
+            return (x, y, int(w), int(h))
+        except Exception:
+            return None
+
+    def get_mall_resource_text_roi(self, image, threshold=None):
+        """
+        mall_resource 专用:
+        - 定位 icon
+        - 推导文本 OCR ROI
+
+        return: roi or None
+        """
+        try:
+            icon_roi = self.match_and_get_roi(image, threshold)
+            if icon_roi is None:
+                # 回退 roi_front
+                ix, iy, iw, ih = self.roi_front
+            else:
+                ix, iy, iw, ih = icon_roi
+
+            x = int(ix) + self.MALL_RESOURCE_X_OFFSET
+            y = int(iy)
+            w = int(iw) + self.MALL_RESOURCE_RIGHT_EXTEND
+            h = int(ih)
+
+            return (x, y, w, h)
+        except Exception:
+            return None
+
+    def build_mall_resource_ocr(self, image, threshold=None, name="mall_resource"):
+        """
+        mall_resource 专用快捷方法:
+        - 定位 icon
+        - 推导 OCR ROI
+        - 构造 RuleOcr
+
+        return: RuleOcr | None
+        """
+        try:
+            roi = self.get_mall_resource_text_roi(image, threshold)
+            if roi is None:
+                return None
+
+            return RuleOcr(
+                roi=roi,
+                area=roi,
+                mode="Quantity",
+                method="Default",
+                keyword="",
+                name=name
+            )
+        except Exception:
+            return None

+ 2 - 2
module/atom/image.py

@@ -7,12 +7,13 @@ import numpy as np
 from numpy import float32, int32, uint8, fromfile
 from numpy import float32, int32, uint8, fromfile
 from pathlib import Path
 from pathlib import Path
 
 
+from atom.RuleImageMallResourceMixin import RuleImageMallResourceMixin
 from module.base.decorator import cached_property
 from module.base.decorator import cached_property
 from module.logger import logger
 from module.logger import logger
 from module.base.utils import is_approx_rectangle
 from module.base.utils import is_approx_rectangle
 
 
 
 
-class RuleImage:
+class RuleImage(RuleImageMallResourceMixin):
     debug_mode: bool = False
     debug_mode: bool = False
 
 
     def __init__(self, roi_front: tuple, roi_back: tuple, method: str, threshold: float, file: str) -> None:
     def __init__(self, roi_front: tuple, roi_back: tuple, method: str, threshold: float, file: str) -> None:
@@ -343,7 +344,6 @@ class RuleImage:
                 return False
                 return False
         return True
         return True
 
 
-
 if __name__ == "__main__":
 if __name__ == "__main__":
     from dev_tools.assets_test import detect_image
     from dev_tools.assets_test import detect_image
 
 

+ 28 - 16
module/atom/ocr.py

@@ -54,21 +54,33 @@ class RuleOcr(Digit, DigitCounter, Duration, Single, Full, Quantity):
         y = np.random.randint(y, y + h)
         y = np.random.randint(y, y + h)
         return x, y
         return x, y
 
 
-
-
 if __name__ == "__main__":
 if __name__ == "__main__":
-    O_MALL_RESOURCE_1 = RuleOcr(roi=(144, 7, 100, 43), area=(144, 7, 100, 43), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_1")
-    O_MALL_RESOURCE_2 = RuleOcr(roi=(326, 8, 124, 39), area=(326, 8, 124, 39), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_2")
-    O_MALL_RESOURCE_3 = RuleOcr(roi=(533, 9, 107, 38), area=(533, 9, 107, 38), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_3")
-    O_MALL_RESOURCE_4 = RuleOcr(roi=(739, 8, 100, 39), area=(739, 8, 100, 39), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_4")
-    O_MALL_RESOURCE_5 = RuleOcr(roi=(935, 11, 100, 37), area=(935, 11, 100, 37), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_5")
-    O_MALL_RESOURCE_6 = RuleOcr(roi=(1129, 6, 100, 41), area=(1129, 6, 100, 41), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_6")
-    image = cv2.imread(r"E:\2025-01-16225353.png")
-    print(O_MALL_RESOURCE_5.ocr_quantity(image))
+    # O_MALL_RESOURCE_1 = RuleOcr(roi=(144, 7, 100, 43), area=(144, 7, 100, 43), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_1")
+    # O_MALL_RESOURCE_2 = RuleOcr(roi=(326, 8, 124, 39), area=(326, 8, 124, 39), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_2")
+    # O_MALL_RESOURCE_3 = RuleOcr(roi=(533, 9, 107, 38), area=(533, 9, 107, 38), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_3")
+    # O_MALL_RESOURCE_4 = RuleOcr(roi=(739, 8, 100, 39), area=(739, 8, 100, 39), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_4")
+    # O_MALL_RESOURCE_5 = RuleOcr(roi=(935, 11, 100, 37), area=(935, 11, 100, 37), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_5")
+    # O_MALL_RESOURCE_6 = RuleOcr(roi=(1129, 6, 100, 41), area=(1129, 6, 100, 41), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_6")
+    # image = cv2.imread(r"E:\2025-01-16225353.png")
+    # print(O_MALL_RESOURCE_5.ocr_quantity(image))
+    from module.atom.image import RuleImage
+    image = cv2.imread(r"E:\Debug\MuMu-20260119-114931-173.png")
+
+    I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(155,8,42,42), roi_back=(155,7,1115,90), threshold=0.7, method="Template matching", file="E:\Debug\\navbar_mall_sccales_check.png")
+
+    #roi = I_SIDE_CHECK_SPECIAL.get_mall_resource_text_roi(image, threshold=0.7)
+
+    rule = I_SIDE_CHECK_SPECIAL.build_mall_resource_ocr(
+        image,
+        threshold=0.7,
+        name="mall_resource_1"
+    )
+
+    print(rule.ocr_quantity(image))
 
 

+ 24 - 11
tasks/RichMan/assets.py

@@ -173,40 +173,53 @@ class RichManAssets:
 	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")
 	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
+	# 体力 
+	I_MALL_RESOURCE_AP = RuleImage(roi_front=(155,7,45,43), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_ap.png")
+	# 荣誉 
+	I_MALL_RESOURCE_HONOR = RuleImage(roi_front=(722,11,41,42), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_honor.png")
+	# 友情点 
+	I_MALL_RESOURCE_FRIENDS = RuleImage(roi_front=(908,8,39,43), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_friends.png")
+	# 勋章 
+	I_MALL_RESOURCE_MEDAL = RuleImage(roi_front=(535,9,40,44), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_medal.png")
+	# 魅力值 
+	I_MALL_RESOURCE_CHARISMA = RuleImage(roi_front=(906,5,48,46), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_charisma.png")
+
+
 	# Image Rule Assets
 	# Image Rule Assets
 	# 特殊 
 	# 特殊 
 	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
 	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
 	# 特殊 
 	# 特殊 
-	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(215,7,42,42), roi_back=(215,7,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
+	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(155,8,42,42), roi_back=(155,8,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
 	# 荣誉 
 	# 荣誉 
 	I_SIDE_SUER_HONOR = RuleImage(roi_front=(1180,191,59,60), roi_back=(1150,159,103,132), threshold=0.6, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.png")
 	I_SIDE_SUER_HONOR = RuleImage(roi_front=(1180,191,59,60), roi_back=(1150,159,103,132), threshold=0.6, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.png")
 	# 荣誉 
 	# 荣誉 
-	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(752,11,41,42), roi_back=(752,11,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
+	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(722,11,41,42), roi_back=(722,11,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
 	# 友情点 
 	# 友情点 
 	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1190,287,43,52), roi_back=(1163,258,93,126), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
 	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1190,287,43,52), roi_back=(1163,258,93,126), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
 	# 友情点 
 	# 友情点 
-	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(925,8,39,43), roi_back=(9,8,1266,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
+	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(908,8,39,43), roi_back=(9,8,1266,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
 	# 勋章 
 	# 勋章 
 	I_SIDE_SURE_MEDAL = RuleImage(roi_front=(1190,404,39,62), roi_back=(1156,352,112,128), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
 	I_SIDE_SURE_MEDAL = RuleImage(roi_front=(1190,404,39,62), roi_back=(1156,352,112,128), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
 	# 勋章 
 	# 勋章 
-	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(665,6,40,44), roi_back=(453,1,476,58), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
+	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(535,9,40,44), roi_back=(453,1,476,58), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
 	# 魅力值 
 	# 魅力值 
-	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1181,467,59,58), roi_back=(1158,445,101,142), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
+	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1181,502,59,58), roi_back=(1158,475,101,112), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
 	# 魅力值 
 	# 魅力值 
-	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(917,9,48,46), roi_back=(886,1,114,80), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
+	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(906,5,48,46), roi_back=(886,1,114,80), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 左数第一个 
 	# 左数第一个 
-	O_MALL_RESOURCE_1 = RuleOcr(roi=(261,8,100,43), area=(261,8,100,43), mode="Quantity", method="Default", keyword="", name="mall_resource_1")
+	O_MALL_RESOURCE_1 = RuleOcr(roi=(208,7,100,43), area=(208,7,100,43), mode="Quantity", method="Default", keyword="", name="mall_resource_1")
 	# 左数第二个 
 	# 左数第二个 
-	O_MALL_RESOURCE_2 = RuleOcr(roi=(415,8,124,39), area=(415,8,124,39), mode="Quantity", method="Default", keyword="", name="mall_resource_2")
+	O_MALL_RESOURCE_2 = RuleOcr(roi=(382,8,124,39), area=(382,8,124,39), mode="Quantity", method="Default", keyword="", name="mall_resource_2")
 	# 左数第三个 
 	# 左数第三个 
-	O_MALL_RESOURCE_3 = RuleOcr(roi=(596,10,107,38), area=(596,10,107,38), mode="Quantity", method="Default", keyword="", name="mall_resource_3")
+	O_MALL_RESOURCE_3 = RuleOcr(roi=(574,9,127,38), area=(574,9,127,38), mode="Quantity", method="Default", keyword="", name="mall_resource_3")
 	# 左数第四个 
 	# 左数第四个 
-	O_MALL_RESOURCE_4 = RuleOcr(roi=(783,9,100,39), area=(783,9,100,39), mode="Quantity", method="Default", keyword="", name="mall_resource_4")
+	O_MALL_RESOURCE_4 = RuleOcr(roi=(755,9,128,39), area=(755,9,128,39), mode="Quantity", method="Default", keyword="", name="mall_resource_4")
 	# 左数第五个 
 	# 左数第五个 
-	O_MALL_RESOURCE_5 = RuleOcr(roi=(958,9,100,37), area=(958,9,100,37), mode="Quantity", method="Default", keyword="", name="mall_resource_5")
+	O_MALL_RESOURCE_5 = RuleOcr(roi=(943,9,116,37), area=(943,9,116,37), mode="Quantity", method="Default", keyword="", name="mall_resource_5")
 	# 左数第六个 
 	# 左数第六个 
 	O_MALL_RESOURCE_6 = RuleOcr(roi=(1129,6,100,41), area=(1129,6,100,41), mode="Quantity", method="Default", keyword="", name="mall_resource_6")
 	O_MALL_RESOURCE_6 = RuleOcr(roi=(1129,6,100,41), area=(1129,6,100,41), mode="Quantity", method="Default", keyword="", name="mall_resource_6")
 	# 左数第二排第一个 
 	# 左数第二排第一个 

+ 2 - 2
tasks/RichMan/mall/charisma.py

@@ -25,12 +25,12 @@ class Charisma(FriendshipPoints):
         # 黑色碎片
         # 黑色碎片
         if con.black_daruma_scrap:
         if con.black_daruma_scrap:
             self.buy_mall_more(buy_button=self.I_CH_BLACK, remain_number=True,
             self.buy_mall_more(buy_button=self.I_CH_BLACK, remain_number=True,
-                               money_ocr=self.O_MALL_RESOURCE_5,
+                               money_ocr=self.I_MALL_RESOURCE_CHARISMA.build_mall_resource_ocr(self.device.image),
                                buy_number=2, buy_max=2, buy_money=320)
                                buy_number=2, buy_max=2, buy_money=320)
         # 蓝票
         # 蓝票
         if con.mystery_amulet:
         if con.mystery_amulet:
             self.buy_mall_one(buy_button=self.I_CH_BLUE, buy_check=self.I_CH_CHECK_BLUE,
             self.buy_mall_one(buy_button=self.I_CH_BLUE, buy_check=self.I_CH_CHECK_BLUE,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=400)
+                              money_ocr=self.I_MALL_RESOURCE_CHARISMA.build_mall_resource_ocr(self.device.image), buy_money=400)
 
 
 
 
 
 

+ 4 - 4
tasks/RichMan/mall/friendship_points.py

@@ -24,12 +24,12 @@ class FriendshipPoints(Special):
         # 购买
         # 购买
         if con.white_daruma:
         if con.white_daruma:
             self.buy_mall_one(buy_button=self.I_FS_WHITE_CLICK, buy_check=self.I_FS_WHITE_CHECK,
             self.buy_mall_one(buy_button=self.I_FS_WHITE_CLICK, buy_check=self.I_FS_WHITE_CHECK,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=1000)
+                              money_ocr=self.I_MALL_RESOURCE_FRIENDS.build_mall_resource_ocr(self.device.image), buy_money=1000)
         if con.red_daruma != 0:
         if con.red_daruma != 0:
-            self.buy_mall_more(buy_button=self.I_FS_RED, remain_number=False, money_ocr=self.O_MALL_RESOURCE_5,
+            self.buy_mall_more(buy_button=self.I_FS_RED, remain_number=False, money_ocr=self.I_MALL_RESOURCE_FRIENDS.build_mall_resource_ocr(self.device.image),
                                buy_number=con.red_daruma, buy_max=99, buy_money=150)
                                buy_number=con.red_daruma, buy_max=99, buy_money=150)
         if con.broken_amulet != 0:
         if con.broken_amulet != 0:
-            self.buy_mall_more(buy_button=self.I_FS_BROKEN, remain_number=False, money_ocr=self.O_MALL_RESOURCE_5,
+            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)
                                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):
@@ -129,7 +129,7 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
 
 
-    c = Config('oas1')
+    c = Config('debug')
     d = Device(c)
     d = Device(c)
     t = FriendshipPoints(c, d)
     t = FriendshipPoints(c, d)
 
 

+ 4 - 4
tasks/RichMan/mall/medal.py

@@ -41,21 +41,21 @@ class Medal(FriendshipPoints):
                               money_ocr=self.O_MALL_RESOURCE_3, buy_money=320)
                               money_ocr=self.O_MALL_RESOURCE_3, buy_money=320)
         # 两颗白蛋
         # 两颗白蛋
         if con.white_daruma:
         if con.white_daruma:
-            self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,
+            self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=2, buy_max=2, buy_money=100)
                                buy_number=2, buy_max=2, buy_money=100)
         # 十张挑战券
         # 十张挑战券
         if con.challenge_pass:
         if con.challenge_pass:
-            self.buy_mall_more(buy_button=self.I_ME_CHALLENGE_PASS, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,
+            self.buy_mall_more(buy_button=self.I_ME_CHALLENGE_PASS, remain_number=True, money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=con.challenge_pass, buy_max=10, buy_money=30)
                                buy_number=con.challenge_pass, buy_max=10, buy_money=30)
         # 红蛋
         # 红蛋
         if con.red_daruma:
         if con.red_daruma:
             self.buy_mall_more(buy_button=self.I_ME_RED, remain_number=False,
             self.buy_mall_more(buy_button=self.I_ME_RED, remain_number=False,
-                               money_ocr=self.O_MALL_RESOURCE_3,
+                               money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=con.red_daruma, buy_max=99, buy_money=30)
                                buy_number=con.red_daruma, buy_max=99, buy_money=30)
         # 破碎的咒符
         # 破碎的咒符
         if con.broken_amulet:
         if con.broken_amulet:
             self.buy_mall_more(buy_button=self.I_ME_BROKEN, remain_number=False,
             self.buy_mall_more(buy_button=self.I_ME_BROKEN, remain_number=False,
-                               money_ocr=self.O_MALL_RESOURCE_3,
+                               money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=con.broken_amulet, buy_max=99, buy_money=20)
                                buy_number=con.broken_amulet, buy_max=99, buy_money=20)
 
 
         time.sleep(1)
         time.sleep(1)

+ 47 - 0
tasks/RichMan/mall/navbar/image_mall_resource.json

@@ -0,0 +1,47 @@
+[
+  {
+    "itemName": "mall_resource_ap",
+    "imageName": "navbar_mall_resource_ap.png",
+    "roiFront": "155,7,45,43",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "体力"
+  },
+  {
+    "itemName": "mall_resource_honor",
+    "imageName": "navbar_mall_resource_honor.png",
+    "roiFront": "722,11,41,42",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "荣誉"
+  },
+  {
+    "itemName": "mall_resource_friends",
+    "imageName": "navbar_mall_resource_friends.png",
+    "roiFront": "908,8,39,43",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "友情点"
+  },
+  {
+    "itemName": "mall_resource_medal",
+    "imageName": "navbar_mall_resource_medal.png",
+    "roiFront": "535,9,40,44",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "勋章"
+  },
+  {
+    "itemName": "mall_resource_charisma",
+    "imageName": "navbar_mall_resource_charisma.png",
+    "roiFront": "906,5,48,46",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "魅力值"
+  }
+]

+ 9 - 9
tasks/RichMan/mall/navbar/image_side.json

@@ -11,8 +11,8 @@
   {
   {
     "itemName": "side_check_special",
     "itemName": "side_check_special",
     "imageName": "navbar_side_check_special.png",
     "imageName": "navbar_side_check_special.png",
-    "roiFront": "215,7,42,42",
-    "roiBack": "215,7,42,42",
+    "roiFront": "155,8,42,42",
+    "roiBack": "155,8,42,42",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "特殊"
     "description": "特殊"
@@ -29,8 +29,8 @@
   {
   {
     "itemName": "side_check_honor",
     "itemName": "side_check_honor",
     "imageName": "navbar_side_check_honor.png",
     "imageName": "navbar_side_check_honor.png",
-    "roiFront": "752,11,41,42",
-    "roiBack": "752,11,41,42",
+    "roiFront": "722,11,41,42",
+    "roiBack": "722,11,41,42",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "荣誉"
     "description": "荣誉"
@@ -47,7 +47,7 @@
   {
   {
     "itemName": "side_check_friends",
     "itemName": "side_check_friends",
     "imageName": "navbar_side_check_friends.png",
     "imageName": "navbar_side_check_friends.png",
-    "roiFront": "925,8,39,43",
+    "roiFront": "908,8,39,43",
     "roiBack": "9,8,1266,43",
     "roiBack": "9,8,1266,43",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -65,7 +65,7 @@
   {
   {
     "itemName": "side_check_medal",
     "itemName": "side_check_medal",
     "imageName": "navbar_side_check_medal.png",
     "imageName": "navbar_side_check_medal.png",
-    "roiFront": "665,6,40,44",
+    "roiFront": "535,9,40,44",
     "roiBack": "453,1,476,58",
     "roiBack": "453,1,476,58",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -74,8 +74,8 @@
   {
   {
     "itemName": "side_sure_charisma",
     "itemName": "side_sure_charisma",
     "imageName": "navbar_side_sure_charisma.png",
     "imageName": "navbar_side_sure_charisma.png",
-    "roiFront": "1181,467,59,58",
-    "roiBack": "1158,445,101,142",
+    "roiFront": "1181,502,59,58",
+    "roiBack": "1158,475,101,112",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "魅力值"
     "description": "魅力值"
@@ -83,7 +83,7 @@
   {
   {
     "itemName": "side_check_charisma",
     "itemName": "side_check_charisma",
     "imageName": "navbar_side_check_charisma.png",
     "imageName": "navbar_side_check_charisma.png",
-    "roiFront": "917,9,48,46",
+    "roiFront": "906,5,48,46",
     "roiBack": "886,1,114,80",
     "roiBack": "886,1,114,80",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 10 - 10
tasks/RichMan/mall/navbar/ocr.json

@@ -1,8 +1,8 @@
 [
 [
   {
   {
     "itemName": "mall_resource_1",
     "itemName": "mall_resource_1",
-    "roiFront": "261,8,100,43",
-    "roiBack": "261,8,100,43",
+    "roiFront": "208,7,100,43",
+    "roiBack": "208,7,100,43",
     "mode": "Quantity",
     "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   },
   {
   {
     "itemName": "mall_resource_2",
     "itemName": "mall_resource_2",
-    "roiFront": "415,8,124,39",
-    "roiBack": "415,8,124,39",
+    "roiFront": "382,8,124,39",
+    "roiBack": "382,8,124,39",
     "mode": "Quantity",
     "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   },
   {
   {
     "itemName": "mall_resource_3",
     "itemName": "mall_resource_3",
-    "roiFront": "596,10,107,38",
-    "roiBack": "596,10,107,38",
+    "roiFront": "574,9,127,38",
+    "roiBack": "574,9,127,38",
     "mode": "Quantity",
     "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -28,8 +28,8 @@
   },
   },
   {
   {
     "itemName": "mall_resource_4",
     "itemName": "mall_resource_4",
-    "roiFront": "783,9,100,39",
-    "roiBack": "783,9,100,39",
+    "roiFront": "755,9,128,39",
+    "roiBack": "755,9,128,39",
     "mode": "Quantity",
     "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -37,8 +37,8 @@
   },
   },
   {
   {
     "itemName": "mall_resource_5",
     "itemName": "mall_resource_5",
-    "roiFront": "958,9,100,37",
-    "roiBack": "958,9,100,37",
+    "roiFront": "943,9,116,37",
+    "roiBack": "943,9,116,37",
     "mode": "Quantity",
     "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",