Ver código fonte

Merge pull request #1344 from migsmiku/dev

修复大富翁 OCR
huangrunheng 10 meses atrás
pai
commit
a4c0846781

+ 27 - 14
tasks/RichMan/assets.py

@@ -68,7 +68,7 @@ class RichManAssets:
 	# 中级盘剩余 
 	O_BL_RES_MEDIUM = RuleOcr(roi=(918,285,28,27), area=(918,285,28,27), mode="Digit", method="Default", keyword="", name="bl_res_medium")
 	# 检查契灵的钱是否够 
-	O_BL_CHECK_MONEY = RuleOcr(roi=(1123,12,127,33), area=(1123,12,127,33), mode="DigitCounter", method="Default", keyword="", name="bl_check_money")
+	O_BL_CHECK_MONEY = RuleOcr(roi=(1137,12,125,33), area=(1137,12,125,33), mode="DigitCounter", method="Default", keyword="", name="bl_check_money")
 
 
 	# Image Rule Assets
@@ -198,17 +198,30 @@ class RichManAssets:
 
 	# Ocr Rule Assets
 	# 左数第一个 
-	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_1 = RuleOcr(roi=(261,8,100,43), area=(261,8,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_3 = RuleOcr(roi=(596,10,107,38), area=(596,10,107,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_5 = RuleOcr(roi=(958,9,100,37), area=(958,9,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")
+	# 左数第二排第一个 
+	O_MALL_RESOURCE_7 = RuleOcr(roi=(1100,54,150,38), area=(1100,54,150,38), mode="Quantity", method="Default", keyword="", name="mall_resource_7")
+
+
+	# Ocr Rule Assets
+	# 左数第一个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_1 = RuleOcr(roi=(533,9,107,38), area=(533,9,107,38), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_1")
+	# 左数第二个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_2 = RuleOcr(roi=(739,8,100,39), area=(739,8,100,39), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_2")
+	# 左数第三个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_3 = RuleOcr(roi=(935,11,100,37), area=(935,11,100,37), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_3")
+	# 左数第四个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_4 = RuleOcr(roi=(1129,6,100,41), area=(1129,6,100,41), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_4")
 
 
 	# Click Rule Assets
@@ -267,7 +280,7 @@ class RichManAssets:
 
 	# Ocr Rule Assets
 	# 蛇皮剩余可买的 
-	O_SCA_NUMBER_OROCHI = RuleOcr(roi=(46,318,30,25), area=(46,318,30,25), mode="Quantity", method="Default", keyword="", name="sca_number_orochi")
+	O_SCA_NUMBER_OROCHI = RuleOcr(roi=(41,318,34,25), area=(41,318,34,25), mode="Quantity", method="Default", keyword="", name="sca_number_orochi")
 	# 首领御魂剩余可买的 
 	O_SCA_NUMBER_DEMON = RuleOcr(roi=(627,319,30,25), area=(627,319,30,25), mode="Quantity", method="Default", keyword="", name="sca_number_demon")
 	# 永生之海 
@@ -275,11 +288,11 @@ class RichManAssets:
 	# 多少号位 
 	O_SCA_DEMON_POSTION = RuleOcr(roi=(960,244,88,41), area=(960,244,88,41), mode="Single", method="Default", keyword="", name="sca_demon_postion")
 	# 朴素的御魂 
-	O_SCA_RES_OROCHI = RuleOcr(roi=(531,9,127,37), area=(531,9,127,37), mode="DigitCounter", method="Default", keyword="", name="sca_res_orochi")
+	O_SCA_RES_OROCHI = RuleOcr(roi=(610,9,127,37), area=(610,9,127,37), mode="DigitCounter", method="Default", keyword="", name="sca_res_orochi")
 	# 首领御魂数量 
-	O_SCA_RES_DEMON = RuleOcr(roi=(949,10,86,35), area=(949,10,86,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
+	O_SCA_RES_DEMON = RuleOcr(roi=(949,10,134,35), area=(949,10,134,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
 	# 永生之海 
-	O_SCA_RES_SEA = RuleOcr(roi=(1152,11,80,38), area=(1152,11,80,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
+	O_SCA_RES_SEA = RuleOcr(roi=(1134,11,117,38), area=(1134,11,117,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
 
 
 	# Image Rule Assets

+ 2 - 2
tasks/RichMan/mall/bondlings/ocr.json

@@ -37,8 +37,8 @@
   },
   {
     "itemName": "bl_check_money",
-    "roiFront": "1123,12,127,33",
-    "roiBack": "1123,12,127,33",
+    "roiFront": "1137,12,125,33",
+    "roiBack": "1137,12,125,33",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 5 - 2
tasks/RichMan/mall/consignment.py

@@ -28,10 +28,13 @@ class Consignment(Buy, MallNavbar):
             logger.info('Consignment buy_sale_ticket is not enable')
             return
         self._enter_consignment()
-        self.ui_click(self.I_CON_ENTER, self.I_CON_ENTER_CHECK)
+        # 等待页面加载
         time.sleep(0.5)
         self.screenshot()
-        if not self.mall_check_money(3, 100):
+        # 进入寄售屋兑换页面
+        self.ui_click(self.I_CON_ENTER, self.I_CON_ENTER_CHECK)
+        #检查勾玉是否足够
+        if not self.mall_check_money_legacy(1, 100):
             logger.warning('Consignment money is not enough')
             return
         remain_number = self.O_CON_NUMBER.ocr(self.device.image)

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

@@ -38,7 +38,7 @@ class Medal(FriendshipPoints):
         # 随机御魂
         if con.random_soul:
             self.buy_mall_one(buy_button=self.I_ME_SOULS, buy_check=self.I_ME_CHECK_SOULS,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=320)
+                              money_ocr=self.O_MALL_RESOURCE_3, buy_money=320)
         # 两颗白蛋
         if con.white_daruma:
             self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,

+ 30 - 0
tasks/RichMan/mall/navbar.py

@@ -104,6 +104,7 @@ class MallNavbar(GameUi, RichManAssets):
             4: self.O_MALL_RESOURCE_4,
             5: self.O_MALL_RESOURCE_5,
             6: self.O_MALL_RESOURCE_6,
+            7: self.O_MALL_RESOURCE_7,
         }
         self.screenshot()
         result = match[index].ocr(self.device.image)
@@ -117,6 +118,35 @@ class MallNavbar(GameUi, RichManAssets):
 
     def mall_check_money(self, index: int, least: int) -> bool:
         return self.mall_resource(index) >= least
+    
+    #add legacy check money method for compatibility, for consignment task
+    def mall_check_money_legacy(self, index: int, least: int) -> bool:
+        """
+        Legacy implementation.
+        旧版商城资源判断逻辑(包含资源获取 + 校验)用于插画屋和寄售屋任务
+        :param index: 从左开始数 1-4 对应第1-4个资源 least 最少多少
+        :return: bool
+        """
+
+        match = {
+            1: self.O_LEGACY_MALL_RESOURCE_1,
+            2: self.O_LEGACY_MALL_RESOURCE_2,
+            3: self.O_LEGACY_MALL_RESOURCE_3,
+            4: self.O_LEGACY_MALL_RESOURCE_4,
+        }
+
+        self.screenshot()
+        result = match[index].ocr(self.device.image)
+
+        if not isinstance(result, int):
+            logger.warning(f'Get mall resource {index} error, result: {result}')
+            return False
+
+        if result == 0:
+            logger.warning(f'Get mall resource {index} error, result: {result}')
+            return False
+
+        return result >= least
 
 if __name__ == '__main__':
     from module.config.config import Config

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


+ 23 - 14
tasks/RichMan/mall/navbar/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "mall_resource_1",
-    "roiFront": "144,7,100,43",
-    "roiBack": "144,7,100,43",
+    "roiFront": "261,8,100,43",
+    "roiBack": "261,8,100,43",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "mall_resource_2",
-    "roiFront": "326,8,124,39",
-    "roiBack": "326,8,124,39",
+    "roiFront": "415,8,124,39",
+    "roiBack": "415,8,124,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -19,30 +19,30 @@
   },
   {
     "itemName": "mall_resource_3",
-    "roiFront": "533,9,107,38",
-    "roiBack": "533,9,107,38",
+    "roiFront": "596,10,107,38",
+    "roiBack": "596,10,107,38",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第三个"
   },
   {
     "itemName": "mall_resource_4",
-    "roiFront": "739,8,100,39",
-    "roiBack": "739,8,100,39",
+    "roiFront": "783,9,100,39",
+    "roiBack": "783,9,100,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第四个"
   },
   {
     "itemName": "mall_resource_5",
-    "roiFront": "935,11,100,37",
-    "roiBack": "935,11,100,37",
+    "roiFront": "958,9,100,37",
+    "roiBack": "958,9,100,37",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第五个"
   },
   {
     "itemName": "mall_resource_6",
@@ -51,6 +51,15 @@
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第六个"
+  },
+  {
+    "itemName": "mall_resource_7",
+    "roiFront": "1100,54,150,38",
+    "roiBack": "1100,54,150,38",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第二排第一个"
   }
 ]

+ 38 - 0
tasks/RichMan/mall/navbar/ocr_legacy.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "legacy_mall_resource_1",
+    "roiFront": "533,9,107,38",
+    "roiBack": "533,9,107,38",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第一个(插画屋/寄售屋)"
+  },
+  {
+    "itemName": "legacy_mall_resource_2",
+    "roiFront": "739,8,100,39",
+    "roiBack": "739,8,100,39",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第二个(插画屋/寄售屋)"
+  },
+  {
+    "itemName": "legacy_mall_resource_3",
+    "roiFront": "935,11,100,37",
+    "roiBack": "935,11,100,37",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第三个(插画屋/寄售屋)"
+  },
+  {
+    "itemName": "legacy_mall_resource_4",
+    "roiFront": "1129,6,100,41",
+    "roiBack": "1129,6,100,41",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第四个(插画屋/寄售屋)"
+  }
+]

+ 1 - 1
tasks/RichMan/mall/scales.py

@@ -76,7 +76,7 @@ class Scales(Buy, MallNavbar):
                     self.screenshot()
                     if not self.appear(self.I_SCA_SIX_STAR):
                         break
-                    if self.click(self.C_SCA_SOULS_GET, interval=1):
+                    if self.click(self.C_SCA_SOULS_BACK, interval=1):
                         continue
                 # 收获购买的东西
                 logger.info('Scales get success')

+ 8 - 8
tasks/RichMan/mall/scales/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "sca_number_orochi",
-    "roiFront": "46,318,30,25",
-    "roiBack": "46,318,30,25",
+    "roiFront": "41,318,34,25",
+    "roiBack": "41,318,34,25",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -37,8 +37,8 @@
   },
   {
     "itemName": "sca_res_orochi",
-    "roiFront": "531,9,127,37",
-    "roiBack": "531,9,127,37",
+    "roiFront": "610,9,127,37",
+    "roiBack": "610,9,127,37",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -46,8 +46,8 @@
   },
   {
     "itemName": "sca_res_demon",
-    "roiFront": "949,10,86,35",
-    "roiBack": "949,10,86,35",
+    "roiFront": "949,10,134,35",
+    "roiBack": "949,10,134,35",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
@@ -55,8 +55,8 @@
   },
   {
     "itemName": "sca_res_sea",
-    "roiFront": "1152,11,80,38",
-    "roiBack": "1152,11,80,38",
+    "roiFront": "1134,11,117,38",
+    "roiBack": "1134,11,117,38",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

BIN
tasks/RichMan/mall/scales/scales_sca_demon_souls.png


BIN
tasks/RichMan/mall/scales/scales_sca_orochi_scales.png