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

fix(RichMan): 修复购买首领御魂

Neptine 9 месяцев назад
Родитель
Сommit
2b0e76bb98

+ 2 - 1
tasks/Restart/login.py

@@ -353,8 +353,9 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
             if self.appear_then_click(self.I_LOGIN_RED_CLOSE, interval=1):# 万花牌X
             if self.appear_then_click(self.I_LOGIN_RED_CLOSE, interval=1):# 万花牌X
                 continue
                 continue
             # 一键完成
             # 一键完成
-            if count_success >= 6:
+            if count_success >= 3:
                 logger.info(f'Click complete tasks {count_success} times')
                 logger.info(f'Click complete tasks {count_success} times')
+                break
             if self.appear_then_click(self.I_COMPLETE_TASKS, interval=2.3):
             if self.appear_then_click(self.I_COMPLETE_TASKS, interval=2.3):
                 count_success += 1
                 count_success += 1
                 continue
                 continue

+ 9 - 9
tasks/RichMan/assets.py

@@ -264,17 +264,17 @@ class RichManAssets:
 	# 永生之海 
 	# 永生之海 
 	I_SCA_PICTURE_BOOK = RuleImage(roi_front=(995,258,100,100), roi_back=(995,258,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_picture_book.png")
 	I_SCA_PICTURE_BOOK = RuleImage(roi_front=(995,258,100,100), roi_back=(995,258,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_picture_book.png")
 	# 土蜘蛛 
 	# 土蜘蛛 
-	I_SCA_DEMON_BOSS_1 = RuleImage(roi_front=(246,224,112,126), roi_back=(168,142,346,290), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_1.png")
+	I_SCA_DEMON_BOSS_1 = RuleImage(roi_front=(246,224,112,126), roi_back=(168,142,949,497), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_1.png")
 	# 胧车 
 	# 胧车 
-	I_SCA_DEMON_BOSS_2 = RuleImage(roi_front=(457,203,123,153), roi_back=(413,136,273,250), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_2.png")
+	I_SCA_DEMON_BOSS_2 = RuleImage(roi_front=(457,203,123,153), roi_back=(155,136,1001,500), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_2.png")
 	# 荒骷髅 
 	# 荒骷髅 
-	I_SCA_DEMON_BOSS_3 = RuleImage(roi_front=(686,239,131,121), roi_back=(631,132,344,273), threshold=0.6, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_3.png")
+	I_SCA_DEMON_BOSS_3 = RuleImage(roi_front=(686,239,131,121), roi_back=(145,132,1017,526), threshold=0.6, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_3.png")
 	# 地震鲶 
 	# 地震鲶 
-	I_SCA_DEMON_BOSS_4 = RuleImage(roi_front=(912,188,141,169), roi_back=(804,121,315,292), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_4.png")
+	I_SCA_DEMON_BOSS_4 = RuleImage(roi_front=(912,188,141,169), roi_back=(165,121,954,521), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_4.png")
 	# 蜃气楼 
 	# 蜃气楼 
-	I_SCA_DEMON_BOSS_5 = RuleImage(roi_front=(345,469,136,160), roi_back=(241,414,504,242), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_5.png")
+	I_SCA_DEMON_BOSS_5 = RuleImage(roi_front=(345,469,136,160), roi_back=(144,127,997,529), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_5.png")
 	# 歌姬 
 	# 歌姬 
-	I_SCA_DEMON_BOSS_6 = RuleImage(roi_front=(561,480,141,141), roi_back=(437,402,555,236), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_6.png")
+	I_SCA_DEMON_BOSS_6 = RuleImage(roi_front=(561,480,141,141), roi_back=(139,110,1011,528), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_6.png")
 	# 永生之海第一个选择 
 	# 永生之海第一个选择 
 	I_SCA_SELECT_1 = RuleImage(roi_front=(189,519,113,51), roi_back=(189,519,113,51), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_select_1.png")
 	I_SCA_SELECT_1 = RuleImage(roi_front=(189,519,113,51), roi_back=(189,519,113,51), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_select_1.png")
 	# description 
 	# description 
@@ -288,7 +288,7 @@ class RichManAssets:
 	# 点击兑换 
 	# 点击兑换 
 	I_SCA_DEMON_BUY = RuleImage(roi_front=(861,572,180,62), roi_back=(861,572,180,62), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_buy.png")
 	I_SCA_DEMON_BUY = RuleImage(roi_front=(861,572,180,62), roi_back=(861,572,180,62), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_buy.png")
 	# 夜荒魂 
 	# 夜荒魂 
-	I_SCA_DEMON_BOSS_7 = RuleImage(roi_front=(819,489,100,100), roi_back=(640,423,412,222), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_7.png")
+	I_SCA_DEMON_BOSS_7 = RuleImage(roi_front=(819,489,100,100), roi_back=(96,125,1024,520), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_demon_boss_7.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
@@ -303,9 +303,9 @@ class RichManAssets:
 	# 朴素的御魂 
 	# 朴素的御魂 
 	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_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,134,35), area=(949,10,134,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
+	O_SCA_RES_DEMON = RuleOcr(roi=(968,11,102,35), area=(968,11,102,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
 	# 永生之海 
 	# 永生之海 
-	O_SCA_RES_SEA = RuleOcr(roi=(1134,11,117,38), area=(1134,11,117,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
+	O_SCA_RES_SEA = RuleOcr(roi=(1136,11,88,38), area=(1136,11,88,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 7 - 7
tasks/RichMan/mall/scales/image.json

@@ -30,7 +30,7 @@
     "itemName": "sca_demon_boss_1",
     "itemName": "sca_demon_boss_1",
     "imageName": "scales_sca_demon_boss_1.png",
     "imageName": "scales_sca_demon_boss_1.png",
     "roiFront": "246,224,112,126",
     "roiFront": "246,224,112,126",
-    "roiBack": "168,142,346,290",
+    "roiBack": "168,142,949,497",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "土蜘蛛"
     "description": "土蜘蛛"
@@ -39,7 +39,7 @@
     "itemName": "sca_demon_boss_2",
     "itemName": "sca_demon_boss_2",
     "imageName": "scales_sca_demon_boss_2.png",
     "imageName": "scales_sca_demon_boss_2.png",
     "roiFront": "457,203,123,153",
     "roiFront": "457,203,123,153",
-    "roiBack": "413,136,273,250",
+    "roiBack": "155,136,1001,500",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "胧车"
     "description": "胧车"
@@ -48,7 +48,7 @@
     "itemName": "sca_demon_boss_3",
     "itemName": "sca_demon_boss_3",
     "imageName": "scales_sca_demon_boss_3.png",
     "imageName": "scales_sca_demon_boss_3.png",
     "roiFront": "686,239,131,121",
     "roiFront": "686,239,131,121",
-    "roiBack": "631,132,344,273",
+    "roiBack": "145,132,1017,526",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.6,
     "threshold": 0.6,
     "description": "荒骷髅"
     "description": "荒骷髅"
@@ -57,7 +57,7 @@
     "itemName": "sca_demon_boss_4",
     "itemName": "sca_demon_boss_4",
     "imageName": "scales_sca_demon_boss_4.png",
     "imageName": "scales_sca_demon_boss_4.png",
     "roiFront": "912,188,141,169",
     "roiFront": "912,188,141,169",
-    "roiBack": "804,121,315,292",
+    "roiBack": "165,121,954,521",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "地震鲶"
     "description": "地震鲶"
@@ -66,7 +66,7 @@
     "itemName": "sca_demon_boss_5",
     "itemName": "sca_demon_boss_5",
     "imageName": "scales_sca_demon_boss_5.png",
     "imageName": "scales_sca_demon_boss_5.png",
     "roiFront": "345,469,136,160",
     "roiFront": "345,469,136,160",
-    "roiBack": "241,414,504,242",
+    "roiBack": "144,127,997,529",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "蜃气楼"
     "description": "蜃气楼"
@@ -75,7 +75,7 @@
     "itemName": "sca_demon_boss_6",
     "itemName": "sca_demon_boss_6",
     "imageName": "scales_sca_demon_boss_6.png",
     "imageName": "scales_sca_demon_boss_6.png",
     "roiFront": "561,480,141,141",
     "roiFront": "561,480,141,141",
-    "roiBack": "437,402,555,236",
+    "roiBack": "139,110,1011,528",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "歌姬"
     "description": "歌姬"
@@ -138,7 +138,7 @@
     "itemName": "sca_demon_boss_7",
     "itemName": "sca_demon_boss_7",
     "imageName": "scales_sca_demon_boss_7.png",
     "imageName": "scales_sca_demon_boss_7.png",
     "roiFront": "819,489,100,100",
     "roiFront": "819,489,100,100",
-    "roiBack": "640,423,412,222",
+    "roiBack": "96,125,1024,520",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "夜荒魂"
     "description": "夜荒魂"

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

@@ -46,8 +46,8 @@
   },
   },
   {
   {
     "itemName": "sca_res_demon",
     "itemName": "sca_res_demon",
-    "roiFront": "949,10,134,35",
-    "roiBack": "949,10,134,35",
+    "roiFront": "968,11,102,35",
+    "roiBack": "968,11,102,35",
     "mode": "Digit",
     "mode": "Digit",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -55,8 +55,8 @@
   },
   },
   {
   {
     "itemName": "sca_res_sea",
     "itemName": "sca_res_sea",
-    "roiFront": "1134,11,117,38",
-    "roiBack": "1134,11,117,38",
+    "roiFront": "1136,11,88,38",
+    "roiBack": "1136,11,88,38",
     "mode": "Digit",
     "mode": "Digit",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",