Forráskód Böngészése

fix(RichMan): ...

Neptine 1 éve
szülő
commit
a8486d6202

+ 1 - 1
module/atom/image.py

@@ -74,7 +74,7 @@ class RuleImage:
         if height != self.roi_front[3] or width != self.roi_front[2]:
         if height != self.roi_front[3] or width != self.roi_front[2]:
             self.roi_front[2] = width
             self.roi_front[2] = width
             self.roi_front[3] = height
             self.roi_front[3] = height
-            logger.info(f"roi_front size changed to {width}x{height}")
+            logger.info(f"{self.name} roi_front size changed to {width}x{height}")
 
 
     def load_kp_des(self) -> None:
     def load_kp_des(self) -> None:
         if self._kp is not None and self._des is not None:
         if self._kp is not None and self._des is not None:

+ 1 - 1
tasks/GuildBanquet/assets.py

@@ -10,7 +10,7 @@ from module.atom.list import RuleList
 class GuildBanquetAssets: 
 class GuildBanquetAssets: 
 
 
 
 
-	# Image Rule Assets 
+	# Image Rule Assets
 	# description 
 	# description 
 	I_FLAG = RuleImage(roi_front=(1035,12,33,60), roi_back=(1035,12,33,60), threshold=0.8, method="Template matching", file="./tasks/GuildBanquet/res/res_flag.png")
 	I_FLAG = RuleImage(roi_front=(1035,12,33,60), roi_back=(1035,12,33,60), threshold=0.8, method="Template matching", file="./tasks/GuildBanquet/res/res_flag.png")
 
 

+ 3 - 3
tasks/RichMan/assets.py

@@ -267,11 +267,11 @@ class RichManAssets:
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 蛇皮剩余可买的 
 	# 蛇皮剩余可买的 
-	O_SCA_NUMBER_OROCHI = RuleOcr(roi=(46,318,27,25), area=(46,318,27,25), mode="Digit", method="Default", keyword="", name="sca_number_orochi")
+	O_SCA_NUMBER_OROCHI = RuleOcr(roi=(46,318,27,25), area=(46,318,27,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="Digit", method="Default", keyword="", name="sca_number_demon")
+	O_SCA_NUMBER_DEMON = RuleOcr(roi=(627,319,30,25), area=(627,319,30,25), mode="Quantity", method="Default", keyword="", name="sca_number_demon")
 	# 永生之海 
 	# 永生之海 
-	O_SCA_NUMBER_SEA = RuleOcr(roi=(926,321,30,23), area=(926,321,30,23), mode="Digit", method="Default", keyword="", name="sca_number_sea")
+	O_SCA_NUMBER_SEA = RuleOcr(roi=(926,321,30,23), area=(926,321,30,23), mode="Quantity", method="Default", keyword="", name="sca_number_sea")
 	# 多少号位 
 	# 多少号位 
 	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_DEMON_POSTION = RuleOcr(roi=(960,244,88,41), area=(960,244,88,41), mode="Single", method="Default", keyword="", name="sca_demon_postion")
 	# 朴素的御魂 
 	# 朴素的御魂 

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

@@ -36,6 +36,8 @@ class Scales(Buy, MallNavbar):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_BUY_PLUS):
             if self.appear(self.I_BUY_PLUS):
                 break
                 break
+            if self.appear(self.I_SCA_SELECT_1) and self.appear(self.I_SCA_SELECT_2):
+                return
             if self.appear_then_click(start_click, interval=1):
             if self.appear_then_click(start_click, interval=1):
                 continue
                 continue
         # 设置购买的数量
         # 设置购买的数量
@@ -355,7 +357,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('oas2')
+    c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = Scales(c, d)
     t = Scales(c, d)
 
 

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

@@ -3,7 +3,7 @@
     "itemName": "sca_number_orochi",
     "itemName": "sca_number_orochi",
     "roiFront": "46,318,27,25",
     "roiFront": "46,318,27,25",
     "roiBack": "46,318,27,25",
     "roiBack": "46,318,27,25",
-    "mode": "Digit",
+    "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "蛇皮剩余可买的"
     "description": "蛇皮剩余可买的"
@@ -12,7 +12,7 @@
     "itemName": "sca_number_demon",
     "itemName": "sca_number_demon",
     "roiFront": "627,319,30,25",
     "roiFront": "627,319,30,25",
     "roiBack": "627,319,30,25",
     "roiBack": "627,319,30,25",
-    "mode": "Digit",
+    "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "首领御魂剩余可买的"
     "description": "首领御魂剩余可买的"
@@ -21,7 +21,7 @@
     "itemName": "sca_number_sea",
     "itemName": "sca_number_sea",
     "roiFront": "926,321,30,23",
     "roiFront": "926,321,30,23",
     "roiBack": "926,321,30,23",
     "roiBack": "926,321,30,23",
-    "mode": "Digit",
+    "mode": "Quantity",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "永生之海"
     "description": "永生之海"