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

fix(RichMan): Update image of guild

Ryland 3 лет назад
Родитель
Сommit
9c2975049d

+ 1 - 1
tasks/GoryouRealm/assets.py

@@ -31,7 +31,7 @@ class GoryouRealmAssets:
 
 
 	# Ocr Rule Assets
-	# 多少张票
+	# 多少张票 
 	O_GR_TICKET = RuleOcr(roi=(920,21,100,41), area=(920,21,100,41), mode="Digit", method="Default", keyword="", name="gr_ticket")
 
 

+ 2 - 4
tasks/RealmRaid/assets.py

@@ -56,11 +56,11 @@ class RealmRaidAssets:
 	# Image Rule Assets
 	# 出现呱太勋章 
 	I_FROG_MEDAL = RuleImage(roi_front=(912,12,32,35), roi_back=(912,12,32,35), threshold=0.8, method="Template matching", file="./tasks/RealmRaid/res/res_frog_medal.png")
-	# 已经进攻三次了
+	# 已经进攻三次了 
 	I_RR_THREE = RuleImage(roi_front=(346,584,42,44), roi_back=(346,584,42,44), threshold=0.8, method="Template matching", file="./tasks/RealmRaid/res/res_rr_three.png")
 	# 呱太入侵, 第一次进入结界时候出现 
 	I_FROG_RAID = RuleImage(roi_front=(511,301,282,100), roi_back=(511,301,282,100), threshold=0.8, method="Template matching", file="./tasks/RealmRaid/res/res_frog_raid.png")
-	# 个人
+	# 个人 
 	I_RR_PERSON = RuleImage(roi_front=(1203,236,56,100), roi_back=(1203,236,56,100), threshold=0.8, method="Template matching", file="./tasks/RealmRaid/res/res_rr_person.png")
 
 
@@ -69,8 +69,6 @@ class RealmRaidAssets:
 	O_FRESH_TIME = RuleOcr(roi=(1042,582,85,36), area=(0,0,100,100), mode="Duration", method="Default", keyword="", name="fresh_time")
 	# 右上角 突破卷的数量 
 	O_NUMBER = RuleOcr(roi=(1143,13,80,39), area=(0,0,100,100), mode="DigitCounter", method="Default", keyword="", name="number")
-	# 右上角 突破卷位置可能出现的文字
-	O_TEXT = RuleOcr(roi=(1143,13,80,39), area=(0,0,100,100), mode="Single", method="Default", keyword="", name="text")
 	# Ocr-description 
 	O_FROG_1 = RuleOcr(roi=(158,168,42,33), area=(158,168,42,33), mode="Digit", method="Default", keyword="", name="frog_1")
 	# Ocr-description 

+ 5 - 3
tasks/RichMan/assets.py

@@ -18,11 +18,11 @@ class RichManAssets:
 	# description 
 	I_GUILD_CLOSE_RED = RuleImage(roi_front=(1029,120,53,57), roi_back=(1029,120,53,57), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_close_red.png")
 	# 蓝票 
-	I_GUILD_BLUE = RuleImage(roi_front=(793,179,74,80), roi_back=(793,179,74,80), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_blue.png")
+	I_GUILD_BLUE = RuleImage(roi_front=(344,186,74,73), roi_back=(315,164,584,370), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_blue.png")
 	# 黑蛋碎片 
-	I_GUILD_SCRAP = RuleImage(roi_front=(570,442,71,68), roi_back=(570,442,71,68), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_scrap.png")
+	I_GUILD_SCRAP = RuleImage(roi_front=(795,187,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,436,71,74), roi_back=(795,436,71,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_skin.png")
+	I_GUILD_SKIN = RuleImage(roi_front=(345,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=(590,246,90,88), roi_back=(590,246,90,88), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_check_scrap.png")
 
@@ -36,6 +36,8 @@ class RichManAssets:
 	O_GUILD_NUMBER_BLACK = RuleOcr(roi=(663,523,21,27), area=(663,523,21,27), mode="Digit", method="Default", keyword="", name="guild_number_black")
 	# Ocr-description 
 	O_GUILD_NUMBER_SKIN = RuleOcr(roi=(889,519,21,35), area=(889,519,21,35), mode="Digit", method="Default", keyword="", name="guild_number_skin")
+	# 本周剩余数量x 
+	O_GUILD_REMAIN = RuleOcr(roi=(304,268,154,33), area=(304,268,154,33), mode="Single", method="Default", keyword="", name="guild_remain")
 
 
 	# Swipe Rule Assets

+ 23 - 15
tasks/RichMan/guild.py

@@ -2,8 +2,10 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+import re
 
 from module.logger import logger
+from module.atom.image import RuleImage
 
 from tasks.GameUi.page import page_main, page_guild
 from tasks.GameUi.game_ui import GameUi
@@ -29,7 +31,7 @@ class Guild(Buy, GameUi, RichManAssets):
         time.sleep(0.5)
         while 1:
             self.screenshot()
-            if self.appear(self.I_GUILD_SCRAP):
+            if self.appear(self.I_GUILD_SKIN):
                 break
             if self.swipe(self.S_GUILD_STORE, interval=1.5):
                 time.sleep(2)
@@ -58,10 +60,7 @@ class Guild(Buy, GameUi, RichManAssets):
         self.screenshot()
         if not self.buy_check_money(self.O_GUILD_TOTAL, 240):
             return False
-        number = self.O_GUILD_NUMBER_BLUE.ocr(self.device.image)
-        if not isinstance(number, int):
-            logger.warning('OCR number failed')
-            return False
+        number = self.check_remain(self.I_GUILD_BLUE)
         if number == 0:
             logger.warning('No mystery amulet can buy')
             return False
@@ -74,10 +73,7 @@ class Guild(Buy, GameUi, RichManAssets):
         self.screenshot()
         if not self.buy_check_money(self.O_GUILD_TOTAL, 200):
             return False
-        number = self.O_GUILD_NUMBER_BLACK.ocr(self.device.image)
-        if not isinstance(number, int):
-            logger.warning('OCR number failed')
-            return False
+        number = self.check_remain(self.I_GUILD_SCRAP)
         if number == 0:
             logger.warning('No black daruma can buy')
             return False
@@ -93,10 +89,7 @@ class Guild(Buy, GameUi, RichManAssets):
         self.screenshot()
         if not self.buy_check_money(self.O_GUILD_TOTAL, 50):
             return False
-        number = self.O_GUILD_NUMBER_SKIN.ocr(self.device.image)
-        if not isinstance(number, int):
-            logger.warning('OCR number failed')
-            return False
+        number = self.check_remain(self.I_GUILD_SKIN)
         if number == 0:
             logger.warning('No skin ticket can buy')
             return False
@@ -104,6 +97,21 @@ class Guild(Buy, GameUi, RichManAssets):
         time.sleep(0.5)
         return True
 
+    def check_remain(self, image: RuleImage) -> int:
+        self.O_GUILD_REMAIN.roi[0] = image.roi_front[0] - 38
+        self.O_GUILD_REMAIN.roi[1] = image.roi_front[1] + 83
+        logger.info(f'Image roi {image.roi_front}')
+        logger.info(f'Image roi {self.O_GUILD_REMAIN.roi}')
+        self.screenshot()
+        result = self.O_GUILD_REMAIN.ocr(self.device.image)
+        result = result.replace('?', '2').replace('?', '2').replace(':', ';')
+        try:
+            result = re.findall(r'本周剩余数量(\d+)', result)[0]
+            result = int(result)
+        except:
+            result = 0
+        logger.info('Remain: %s' % result)
+        return int(result)
 
 
 if __name__ == '__main__':
@@ -114,7 +122,7 @@ if __name__ == '__main__':
     d = Device(c)
     t = Guild(c, d)
 
-    t._guild_skin_ticket(5)
-
+    # t._guild_skin_ticket(5)
+    t.execute_guild(con=c.rich_man.guild_store)
 
 

BIN
tasks/RichMan/guild/guild_guild_blue.png


BIN
tasks/RichMan/guild/guild_guild_scrap.png


BIN
tasks/RichMan/guild/guild_guild_skin.png


+ 6 - 6
tasks/RichMan/guild/image.json

@@ -29,8 +29,8 @@
   {
     "itemName": "guild_blue",
     "imageName": "guild_guild_blue.png",
-    "roiFront": "793,179,74,80",
-    "roiBack": "793,179,74,80",
+    "roiFront": "344,186,74,73",
+    "roiBack": "315,164,584,370",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "蓝票"
@@ -38,8 +38,8 @@
   {
     "itemName": "guild_scrap",
     "imageName": "guild_guild_scrap.png",
-    "roiFront": "570,442,71,68",
-    "roiBack": "570,442,71,68",
+    "roiFront": "795,187,71,68",
+    "roiBack": "331,160,559,372",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "黑蛋碎片"
@@ -47,8 +47,8 @@
   {
     "itemName": "guild_skin",
     "imageName": "guild_guild_skin.png",
-    "roiFront": "795,436,71,74",
-    "roiBack": "795,436,71,74",
+    "roiFront": "345,438,71,72",
+    "roiBack": "320,162,573,371",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "皮肤券"

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

@@ -34,5 +34,14 @@
     "method": "Default",
     "keyword": "",
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "guild_remain",
+    "roiFront": "304,268,154,33",
+    "roiBack": "304,268,154,33",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "本周剩余数量x"
   }
 ]