Преглед изворни кода

Merge pull request #635 from ljxun/fix(Richman)

fix(Richman):大富翁优化
huangrunheng пре 1 година
родитељ
комит
bff9612fcc

+ 9 - 3
tasks/Component/Buy/buy.py

@@ -171,9 +171,15 @@ class Buy(BaseTask, BuyAssets):
             logger.error('Target is not RuleOcr')
             logger.error('Target is not RuleOcr')
             return False
             return False
         current = target.ocr(self.device.image)
         current = target.ocr(self.device.image)
-        if not isinstance(current, int):
-            logger.warning('OCR current money failed')
-            return False
+        if '万' in current:
+            logger.info('Money is enough')
+            return True
+            # 使用正则表达式提取字符串中的数字
+        else:
+            current = int(current)
+        # if not isinstance(current, int):
+        #     logger.warning('OCR current money failed')
+        #     return False
         if current >= minimum:
         if current >= minimum:
             logger.info('Money is enough')
             logger.info('Money is enough')
             return True
             return True

+ 12 - 5
tasks/RichMan/assets.py

@@ -23,13 +23,15 @@ class RichManAssets:
 	I_GUILD_SCRAP = RuleImage(roi_front=(570,439,71,68), roi_back=(331,160,559,372), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_scrap.png")
 	I_GUILD_SCRAP = RuleImage(roi_front=(570,439,71,68), roi_back=(331,160,559,372), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_scrap.png")
 	# 皮肤券 
 	# 皮肤券 
 	I_GUILD_SKIN = RuleImage(roi_front=(795,438,71,72), roi_back=(320,162,573,371), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_skin.png")
 	I_GUILD_SKIN = RuleImage(roi_front=(795,438,71,72), roi_back=(320,162,573,371), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_skin.png")
-	# 购买检查 
+	# 皮肤券判断是否到末端
+	I_GUILD_SKIN_CHECK = RuleImage(roi_front=(795,438,71,72), roi_back=(320,162,573,371), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_skin.png")
+	# 购买检查
 	I_GUILD_CHECK_SCRAP = RuleImage(roi_front=(561,429,90,88), roi_back=(561,429,90,88), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_check_scrap.png")
 	I_GUILD_CHECK_SCRAP = RuleImage(roi_front=(561,429,90,88), roi_back=(561,429,90,88), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_check_scrap.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 总的功勋 
 	# 总的功勋 
-	O_GUILD_TOTAL = RuleOcr(roi=(978,16,58,27), area=(978,16,58,27), mode="Digit", method="Default", keyword="", name="guild_total")
+	O_GUILD_TOTAL = RuleOcr(roi=(942,16,94,27), area=(942,16,94,27), mode="Single", method="Default", keyword="", name="guild_total")
 	# Ocr-description 
 	# Ocr-description 
 	O_GUILD_NUMBER_BLUE = RuleOcr(roi=(888,269,25,33), area=(888,269,25,33), mode="Digit", method="Default", keyword="", name="guild_number_blue")
 	O_GUILD_NUMBER_BLUE = RuleOcr(roi=(888,269,25,33), area=(888,269,25,33), mode="Digit", method="Default", keyword="", name="guild_number_blue")
 	# Ocr-description 
 	# Ocr-description 
@@ -57,7 +59,8 @@ class RichManAssets:
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
-	# 御魂剩余 
+	O_BL_RES_SOULS_new = RuleOcr(roi=(88,417,1049,37), area=(88,417,1049,37), mode="Full", method="Default", keyword="随机御魂", name="bl_res_souls_new")
+	# 御魂剩余
 	O_BL_RES_SOULS = RuleOcr(roi=(90,281,31,34), area=(90,281,31,34), mode="Digit", method="Default", keyword="", name="bl_res_souls")
 	O_BL_RES_SOULS = RuleOcr(roi=(90,281,31,34), area=(90,281,31,34), mode="Digit", method="Default", keyword="", name="bl_res_souls")
 	# 石头剩余 
 	# 石头剩余 
 	O_BL_RES_STONE = RuleOcr(roi=(357,284,29,34), area=(357,284,29,34), mode="Digit", method="Default", keyword="", name="bl_res_stone")
 	O_BL_RES_STONE = RuleOcr(roi=(357,284,29,34), area=(357,284,29,34), mode="Digit", method="Default", keyword="", name="bl_res_stone")
@@ -161,7 +164,11 @@ class RichManAssets:
 	I_MALL_SCALES_SURE = RuleImage(roi_front=(1195,100,62,85), roi_back=(1195,100,62,85), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_scales_sure.png")
 	I_MALL_SCALES_SURE = RuleImage(roi_front=(1195,100,62,85), roi_back=(1195,100,62,85), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_scales_sure.png")
 	# 契灵商店 
 	# 契灵商店 
 	I_MALL_BONDLINGS_SURE = RuleImage(roi_front=(1194,421,69,74), roi_back=(1194,421,69,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_sure.png")
 	I_MALL_BONDLINGS_SURE = RuleImage(roi_front=(1194,421,69,74), roi_back=(1194,421,69,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_sure.png")
-	# 契灵商店 
+	# 已选中契灵商店
+	I_MALL_BONDLINGS_ON = RuleImage(roi_front=(99,417,1021,37), roi_back=(99,417,1021,37), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_on.png")
+	# 随机御魂
+	I_ME_SOULS_NEW = RuleImage(roi_front=(980,417,140,37), roi_back=(980,417,140,37), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_over.png")
+	# 契灵商店
 	I_MALL_BONDLINGS_CHECK = RuleImage(roi_front=(355,186,34,104), roi_back=(355,186,34,104), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_check.png")
 	I_MALL_BONDLINGS_CHECK = RuleImage(roi_front=(355,186,34,104), roi_back=(355,186,34,104), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_check.png")
 	# 杂货铺 
 	# 杂货铺 
 	I_MALL_SUNDRY = RuleImage(roi_front=(880,646,53,54), roi_back=(834,621,116,90), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
 	I_MALL_SUNDRY = RuleImage(roi_front=(880,646,53,54), roi_back=(834,621,116,90), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
@@ -198,7 +205,7 @@ class RichManAssets:
 	# 左数第二个 
 	# 左数第二个 
 	O_MALL_RESOURCE_2 = RuleOcr(roi=(326,8,124,39), area=(326,8,124,39), mode="Digit", method="Default", keyword="", name="mall_resource_2")
 	O_MALL_RESOURCE_2 = RuleOcr(roi=(326,8,124,39), area=(326,8,124,39), mode="Digit", method="Default", keyword="", name="mall_resource_2")
 	# 左数第二个 
 	# 左数第二个 
-	O_MALL_RESOURCE_3 = RuleOcr(roi=(533,9,107,38), area=(533,9,107,38), mode="Digit", method="Default", keyword="", name="mall_resource_3")
+	O_MALL_RESOURCE_3 = RuleOcr(roi=(550,9,107,38), area=(550,9,107,38), mode="Single", method="Default", keyword="", name="mall_resource_3")
 	# 左数第二个 
 	# 左数第二个 
 	O_MALL_RESOURCE_4 = RuleOcr(roi=(739,8,100,39), area=(739,8,100,39), mode="Digit", method="Default", keyword="", name="mall_resource_4")
 	O_MALL_RESOURCE_4 = RuleOcr(roi=(739,8,100,39), area=(739,8,100,39), mode="Digit", method="Default", keyword="", name="mall_resource_4")
 	# 左数第二个 
 	# 左数第二个 

+ 17 - 3
tasks/RichMan/guild.py

@@ -16,6 +16,9 @@ from tasks.RichMan.config import GuildStore
 class Guild(Buy, GameUi, RichManAssets):
 class Guild(Buy, GameUi, RichManAssets):
 
 
     def execute_guild(self, con: GuildStore=None):
     def execute_guild(self, con: GuildStore=None):
+
+        if not con.enable:
+            return
         logger.hr('Start guild', 1)
         logger.hr('Start guild', 1)
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_guild)
         self.ui_goto(page_guild)
@@ -31,7 +34,9 @@ class Guild(Buy, GameUi, RichManAssets):
         time.sleep(0.5)
         time.sleep(0.5)
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear(self.I_GUILD_SKIN):
+            # 功勋商店 购买皮肤券 现在问题是皮肤券作为下滑判断标志,下滑过程中roi_front[1]发生了变化,
+            # 导致后续识别本周剩余数量位置偏差,现在解决方案是创建一个相同属性的I_GUILD_SKIN_CHECK 来作为判断标志
+            if self.appear(self.I_GUILD_SKIN_CHECK):
                 break
                 break
             if self.swipe(self.S_GUILD_STORE, interval=1.5):
             if self.swipe(self.S_GUILD_STORE, interval=1.5):
                 time.sleep(2)
                 time.sleep(2)
@@ -39,10 +44,13 @@ class Guild(Buy, GameUi, RichManAssets):
 
 
         # 开始购买
         # 开始购买
         if con.mystery_amulet:
         if con.mystery_amulet:
+            # 蓝票
             self._guild_mystery_amulet()
             self._guild_mystery_amulet()
         if con.black_daruma_scrap:
         if con.black_daruma_scrap:
+            # 黑碎
             self._guild_black_daruma_scrap()
             self._guild_black_daruma_scrap()
         if con.skin_ticket:
         if con.skin_ticket:
+            # 皮肤券
             self._guild_skin_ticket(con.skin_ticket)
             self._guild_skin_ticket(con.skin_ticket)
 
 
         # 回去
         # 回去
@@ -56,6 +64,7 @@ class Guild(Buy, GameUi, RichManAssets):
                 continue
                 continue
 
 
     def _guild_mystery_amulet(self):
     def _guild_mystery_amulet(self):
+        # 蓝票
         logger.hr('Guild mystery amulet', 2)
         logger.hr('Guild mystery amulet', 2)
         self.screenshot()
         self.screenshot()
         if not self.buy_check_money(self.O_GUILD_TOTAL, 240):
         if not self.buy_check_money(self.O_GUILD_TOTAL, 240):
@@ -69,6 +78,7 @@ class Guild(Buy, GameUi, RichManAssets):
         return True
         return True
 
 
     def _guild_black_daruma_scrap(self):
     def _guild_black_daruma_scrap(self):
+        # 黑碎
         logger.hr('Guild black daruma scrap', 2)
         logger.hr('Guild black daruma scrap', 2)
         self.screenshot()
         self.screenshot()
         if not self.buy_check_money(self.O_GUILD_TOTAL, 200):
         if not self.buy_check_money(self.O_GUILD_TOTAL, 200):
@@ -81,7 +91,8 @@ class Guild(Buy, GameUi, RichManAssets):
         time.sleep(0.5)
         time.sleep(0.5)
         return True
         return True
 
 
-    def _guild_skin_ticket(self, num: int=0):
+    def _guild_skin_ticket(self, num: int = 0):
+        # 皮肤券
         logger.hr('Guild skin ticket', 2)
         logger.hr('Guild skin ticket', 2)
         if num == 0:
         if num == 0:
             logger.warning('No buy skin ticket')
             logger.warning('No buy skin ticket')
@@ -89,10 +100,12 @@ class Guild(Buy, GameUi, RichManAssets):
         self.screenshot()
         self.screenshot()
         if not self.buy_check_money(self.O_GUILD_TOTAL, 50):
         if not self.buy_check_money(self.O_GUILD_TOTAL, 50):
             return False
             return False
+        # 检查功勋商店皮肤券 本周剩余数量
         number = self.check_remain(self.I_GUILD_SKIN)
         number = self.check_remain(self.I_GUILD_SKIN)
         if number == 0:
         if number == 0:
             logger.warning('No skin ticket can buy')
             logger.warning('No skin ticket can buy')
             return False
             return False
+        # 购买功勋商店皮肤券
         self.buy_more(self.I_GUILD_SKIN, number)
         self.buy_more(self.I_GUILD_SKIN, number)
         time.sleep(0.5)
         time.sleep(0.5)
         return True
         return True
@@ -104,6 +117,7 @@ class Guild(Buy, GameUi, RichManAssets):
         logger.info(f'Image roi {self.O_GUILD_REMAIN.roi}')
         logger.info(f'Image roi {self.O_GUILD_REMAIN.roi}')
         self.screenshot()
         self.screenshot()
         result = self.O_GUILD_REMAIN.ocr(self.device.image)
         result = self.O_GUILD_REMAIN.ocr(self.device.image)
+        logger.warning(result)
         result = result.replace('?', '2').replace('?', '2').replace(':', ';')
         result = result.replace('?', '2').replace('?', '2').replace(':', ';')
         try:
         try:
             result = re.findall(r'本周剩余数量(\d+)', result)[0]
             result = re.findall(r'本周剩余数量(\d+)', result)[0]
@@ -118,7 +132,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('mi')
     d = Device(c)
     d = Device(c)
     t = Guild(c, d)
     t = Guild(c, d)
 
 

+ 9 - 0
tasks/RichMan/guild/image.json

@@ -53,6 +53,15 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "皮肤券"
     "description": "皮肤券"
   },
   },
+  {
+    "itemName": "guild_skin_check",
+    "imageName": "guild_guild_skin.png",
+    "roiFront": "795,438,71,72",
+    "roiBack": "320,162,573,371",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "皮肤券判断是否到末端"
+  },
   {
   {
     "itemName": "guild_check_scrap",
     "itemName": "guild_check_scrap",
     "imageName": "guild_guild_check_scrap.png",
     "imageName": "guild_guild_check_scrap.png",

+ 3 - 3
tasks/RichMan/guild/ocr.json

@@ -1,9 +1,9 @@
 [
 [
   {
   {
     "itemName": "guild_total",
     "itemName": "guild_total",
-    "roiFront": "978,16,58,27",
-    "roiBack": "978,16,58,27",
-    "mode": "Digit",
+    "roiFront": "942,16,94,27",
+    "roiBack": "942,16,94,27",
+    "mode": "Single",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "总的功勋"
     "description": "总的功勋"

+ 9 - 1
tasks/RichMan/mall/bondlings.py

@@ -54,6 +54,14 @@ class Bondlings(Buy, MallNavbar):
             logger.info('Buy number is 0')
             logger.info('Buy number is 0')
             return
             return
         self.screenshot()
         self.screenshot()
+
+        if buy_button.name == 'BONDLINGS_BL_BUY_SOULS':
+            if self.appear(self.I_ME_SOULS_NEW):
+                # 契灵御魂已经买光
+                logger.warning('本周契灵御魂已经买光')
+                return
+        pos = self.O_BL_RES_SOULS_new.ocr_full(self.device.image)
+
         # 检查是否出现了购买按钮
         # 检查是否出现了购买按钮
         if not self.appear(buy_button):
         if not self.appear(buy_button):
             logger.warning('Buy button is not appear')
             logger.warning('Buy button is not appear')
@@ -61,7 +69,7 @@ class Bondlings(Buy, MallNavbar):
         # 检查剩余数量
         # 检查剩余数量
         _remain = remain_number.ocr(self.device.image)
         _remain = remain_number.ocr(self.device.image)
         if _remain == 0:
         if _remain == 0:
-            logger.warning('Remain number is 0')
+            logger.warning('本周契灵御魂已经买光')
             return
             return
         if _remain < buy_number:
         if _remain < buy_number:
             logger.warning(f'Remain number is {_remain}, buy number is {buy_number}')
             logger.warning(f'Remain number is {_remain}, buy number is {buy_number}')

+ 20 - 8
tasks/RichMan/mall/friendship_points.py

@@ -9,7 +9,7 @@ from module.atom.ocr import RuleOcr
 
 
 from tasks.RichMan.mall.special import Special
 from tasks.RichMan.mall.special import Special
 from tasks.RichMan.config import FriendshipPoints as FriendshipPointsConfig
 from tasks.RichMan.config import FriendshipPoints as FriendshipPointsConfig
-
+import re
 
 
 class FriendshipPoints(Special):
 class FriendshipPoints(Special):
 
 
@@ -52,11 +52,16 @@ class FriendshipPoints(Special):
         if _remain == 0:
         if _remain == 0:
             logger.warning('Remain number is 0')
             logger.warning('Remain number is 0')
             return False
             return False
-        # 检查钱
+        # 检查总勋章
         current_money = money_ocr.ocr(self.device.image)
         current_money = money_ocr.ocr(self.device.image)
-        if not isinstance(current_money, int):
-            logger.warning('Money ocr failed')
-            return False
+        if '万' in current_money:
+            # 点击购买
+            return self.buy_one(buy_button, buy_check)
+        else:
+            current_money = int(current_money)
+        # if not isinstance(current_money, int):
+        #     logger.warning('Money ocr failed')
+        #     return False
         money_enough = current_money >= buy_money
         money_enough = current_money >= buy_money
         if not money_enough:
         if not money_enough:
             logger.warning(f'No enough money {current_money}')
             logger.warning(f'No enough money {current_money}')
@@ -96,9 +101,16 @@ class FriendshipPoints(Special):
                 buy_number = _remain
                 buy_number = _remain
         # 检查钱够不够
         # 检查钱够不够
         current_money = money_ocr.ocr(self.device.image)
         current_money = money_ocr.ocr(self.device.image)
-        if not isinstance(current_money, int):
-            logger.warning('Money ocr failed')
-            return
+        if '万' in current_money:
+            # 使用正则表达式提取字符串中的数字
+            match = re.search(r'\d+', current_money)
+            if match:
+                current_money = int(match.group()) * 10000
+        else:
+            current_money = int(current_money)
+        # if not isinstance(current_money, int):
+        #     logger.warning('Money ocr failed')
+        #     return
         money_enough = current_money >= buy_money * buy_number
         money_enough = current_money >= buy_money * buy_number
         if not money_enough:
         if not money_enough:
             logger.warning(f'Money is not enough {current_money}')
             logger.warning(f'Money is not enough {current_money}')

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

@@ -26,15 +26,15 @@ class Medal(FriendshipPoints):
         # 黑蛋
         # 黑蛋
         if con.black_daruma:
         if con.black_daruma:
             self.buy_mall_one(buy_button=self.I_ME_BLACK, buy_check=self.I_ME_CHECK_BLACK,
             self.buy_mall_one(buy_button=self.I_ME_BLACK, buy_check=self.I_ME_CHECK_BLACK,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=480)
+                              money_ocr=self.O_MALL_RESOURCE_3, buy_money=480)
         # 蓝票
         # 蓝票
         if con.mystery_amulet:
         if con.mystery_amulet:
             self.buy_mall_one(buy_button=self.I_ME_BLUE, buy_check=self.I_ME_CHECK_BLUE,
             self.buy_mall_one(buy_button=self.I_ME_BLUE, buy_check=self.I_ME_CHECK_BLUE,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=180)
+                              money_ocr=self.O_MALL_RESOURCE_3, buy_money=180)
         # 体力100
         # 体力100
         if con.ap_100:
         if con.ap_100:
             self.buy_mall_one(buy_button=self.I_ME_AP, buy_check=self.I_ME_CHECK_AP,
             self.buy_mall_one(buy_button=self.I_ME_AP, buy_check=self.I_ME_CHECK_AP,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=120)
+                              money_ocr=self.O_MALL_RESOURCE_3, buy_money=120)
         # 随机御魂
         # 随机御魂
         if con.random_soul:
         if con.random_soul:
             pass
             pass
@@ -42,21 +42,21 @@ class Medal(FriendshipPoints):
             #                   money_ocr=self.O_MALL_RESOURCE_5, buy_money=320)
             #                   money_ocr=self.O_MALL_RESOURCE_5, 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_5,
+            self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,
                                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_5,
+            self.buy_mall_more(buy_button=self.I_ME_CHALLENGE_PASS, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,
                                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_5,
+                               money_ocr=self.O_MALL_RESOURCE_3,
                                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_5,
+                               money_ocr=self.O_MALL_RESOURCE_3,
                                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)

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

@@ -34,7 +34,7 @@ class MallNavbar(GameUi, RichManAssets):
         :return:
         :return:
         """
         """
         self._enter_scales()
         self._enter_scales()
-        self.ui_click(self.I_MALL_BONDLINGS_SURE, self.I_MALL_BONDLINGS_CHECK)
+        self.ui_click(self.I_MALL_BONDLINGS_SURE, self.I_MALL_BONDLINGS_ON)
 
 
     def _enter_sundry(self):
     def _enter_sundry(self):
         """
         """

+ 9 - 0
tasks/RichMan/mall/navbar/image_bottom.json

@@ -53,6 +53,15 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "契灵商店"
     "description": "契灵商店"
   },
   },
+  {
+    "itemName": "mall_bondlings_on",
+    "imageName": "navbar_mall_bondlings_on.png",
+    "roiFront": "99,417,1021,37",
+    "roiBack": "99,417,1021,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已选中契灵商店"
+  },
   {
   {
     "itemName": "mall_bondlings_check",
     "itemName": "mall_bondlings_check",
     "imageName": "navbar_mall_bondlings_check.png",
     "imageName": "navbar_mall_bondlings_check.png",

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


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


+ 35 - 3
tasks/RichMan/mall/scales.py

@@ -24,7 +24,7 @@ class Scales(Buy, MallNavbar):
         self._enter_scales()
         self._enter_scales()
 
 
         # 朴素的御魂
         # 朴素的御魂
-        self._scales_orochi(con.orochi_scales)
+        self._scales_orochi_new(con.orochi_scales)
         # 首领御魂
         # 首领御魂
         self._scales_demon(con.demon_souls, con.demon_class, con.demon_position)
         self._scales_demon(con.demon_souls, con.demon_class, con.demon_position)
         # 海国御魂
         # 海国御魂
@@ -111,7 +111,39 @@ class Scales(Buy, MallNavbar):
             if self.appear_then_click(self.I_SCA_SELECT_1, interval=1.6):
             if self.appear_then_click(self.I_SCA_SELECT_1, interval=1.6):
                 continue
                 continue
 
 
-
+    def _scales_orochi_new(self, buy_number: int):
+        """
+        要求必须是在御魂礼盒界面
+        :param buy_number:
+        :return:
+        """
+        logger.hr('Scales orochi', 3)
+        if buy_number == 0:
+            logger.info('The purchase quantity of Scales orochi is 0')
+            return
+        self.screenshot()
+        # 检查是否出现了购买按钮
+        if not self.appear(self.I_SCA_OROCHI_SCALES):
+            logger.warning('Scales orochi is not appear')
+            return
+        while True:
+            self.screenshot()
+            # 检查剩余数量
+            remain_number = self.O_SCA_NUMBER_OROCHI.ocr(self.device.image)
+            if remain_number == 0:
+                logger.warning(f'朴素御魂可购买数量: {remain_number}')
+                return
+            # 检查钱是否够
+            cu, res, total = self.O_SCA_RES_OROCHI.ocr(self.device.image)
+            if cu + res != total:
+                logger.warning('OCR error')
+                continue
+            if cu < 50:
+                logger.warning(f'紫色蛇皮不足,数量:{cu}')
+                return
+            # 购买
+            self._scales_buy_more(self.I_SCA_OROCHI_SCALES)
+            time.sleep(0.5)
     def _scales_orochi(self, buy_number: int):
     def _scales_orochi(self, buy_number: int):
         """
         """
         要求必须是在御魂礼盒界面
         要求必须是在御魂礼盒界面
@@ -323,7 +355,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('oas2')
     d = Device(c)
     d = Device(c)
     t = Scales(c, d)
     t = Scales(c, d)
 
 

+ 4 - 0
tasks/RichMan/script_task.py

@@ -20,9 +20,13 @@ class ScriptTask(Mall, Guild, ThousandThings, Shrine):
 
 
     def run(self):
     def run(self):
         con: RichMan = self.config.rich_man
         con: RichMan = self.config.rich_man
+        # 千物宝箱
         self.execute_tt(con.thousand_things)
         self.execute_tt(con.thousand_things)
+        # 神龛
         self.execute_shrine(con.shrine)
         self.execute_shrine(con.shrine)
+        # 功勋商店
         self.execute_guild(con.guild_store)
         self.execute_guild(con.guild_store)
+        # 商店
         self.execute_mall()
         self.execute_mall()
 
 
         self.set_next_run(task='RichMan', success=True, finish=False)
         self.set_next_run(task='RichMan', success=True, finish=False)