Jelajahi Sumber

fix(task): shikigami activity will automatically switch ap

runhey 3 tahun lalu
induk
melakukan
96fa29c123

+ 7 - 3
tasks/ActivityShikigami/script_task.py

@@ -70,9 +70,13 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
                 break
             # 如果不是那就切换到体力
             elif not is_remain and current_ap == ApMode.AP_ACTIVITY:
-                logger.info("Activity ap out and switch to game ap")
-                current_ap = ApMode.AP_GAME
-                self.switch(current_ap)
+                if config.general_climb.activity_toggle:
+                    logger.info("Activity ap out and switch to game ap")
+                    current_ap = ApMode.AP_GAME
+                    self.switch(current_ap)
+                else:
+                    logger.info("Activity ap out")
+                    break
 
 
             # 点击战斗

+ 18 - 0
tasks/RichMan/assets.py

@@ -81,6 +81,24 @@ class RichManAssets:
 	O_CON_NUMBER = RuleOcr(roi=(813,140,34,38), area=(813,140,34,38), mode="Digit", method="Default", keyword="", name="con_number")
 
 
+	# Image Rule Assets
+	# 蓝票 
+	I_HONOR_BLUE = RuleImage(roi_front=(868,152,100,100), roi_back=(154,113,864,476), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/honor/honor_honor_blue.png")
+	# 黑蛋碎片 
+	I_HONOR_BLACK = RuleImage(roi_front=(645,406,100,100), roi_back=(145,96,883,491), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/honor/honor_honor_black.png")
+	# 三星白蛋 
+	I_HONOR_WHITE = RuleImage(roi_front=(424,399,100,100), roi_back=(155,127,841,388), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/honor/honor_honor_white.png")
+
+
+	# Ocr Rule Assets
+	# Ocr-description 
+	O_HONOR_BLUE = RuleOcr(roi=(973,113,22,26), area=(973,113,22,26), mode="Digit", method="Default", keyword="", name="honor_blue")
+	# Ocr-description 
+	O_HONOR_BLACK = RuleOcr(roi=(749,358,24,34), area=(749,358,24,34), mode="Digit", method="Default", keyword="", name="honor_black")
+	# 三星白蛋 
+	O_HONOR_WHITE = RuleOcr(roi=(527,359,25,28), area=(527,359,25,28), mode="Digit", method="Default", keyword="", name="honor_white")
+
+
 	# Image Rule Assets
 	# 寄售屋 
 	I_MALL_CONSIGNMENT = RuleImage(roi_front=(192,629,63,72), roi_back=(192,629,63,72), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment.png")

TEMPAT SAMPAH
tasks/RichMan/mall/honor/honor_honor_black.png


TEMPAT SAMPAH
tasks/RichMan/mall/honor/honor_honor_blue.png


TEMPAT SAMPAH
tasks/RichMan/mall/honor/honor_honor_white.png


+ 29 - 0
tasks/RichMan/mall/honor/image.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "honor_blue",
+    "imageName": "honor_honor_blue.png",
+    "roiFront": "868,152,100,100",
+    "roiBack": "154,113,864,476",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "蓝票"
+  },
+  {
+    "itemName": "honor_black",
+    "imageName": "honor_honor_black.png",
+    "roiFront": "645,406,100,100",
+    "roiBack": "145,96,883,491",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "黑蛋碎片"
+  },
+  {
+    "itemName": "honor_white",
+    "imageName": "honor_honor_white.png",
+    "roiFront": "424,399,100,100",
+    "roiBack": "155,127,841,388",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "三星白蛋"
+  }
+]

+ 29 - 0
tasks/RichMan/mall/honor/ocr.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "honor_blue",
+    "roiFront": "973,113,22,26",
+    "roiBack": "973,113,22,26",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "honor_black",
+    "roiFront": "749,358,24,34",
+    "roiBack": "749,358,24,34",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "honor_white",
+    "roiFront": "527,359,25,28",
+    "roiBack": "527,359,25,28",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "三星白蛋"
+  }
+]

+ 3 - 3
tasks/RichMan/mall/special.py

@@ -157,9 +157,9 @@ class Special(MallNavbar, Buy):
         roi = self.O_SP_RES_NUMBER.roi
         self.O_SP_RES_NUMBER.roi[0] = upper_midpoint[0] - roi[2]//2
         self.O_SP_RES_NUMBER.roi[1] = upper_midpoint[1] - roi[3]
-        logger.info(f'图片的ROI是: {target.roi_front}')
-        logger.info(f'上中点是:{upper_midpoint}')
-        logger.info(f'数字的ROI是: {self.O_SP_RES_NUMBER.roi}')
+        # logger.info(f'图片的ROI是: {target.roi_front}')
+        # logger.info(f'上中点是:{upper_midpoint}')
+        # logger.info(f'数字的ROI是: {self.O_SP_RES_NUMBER.roi}')
         result = self.O_SP_RES_NUMBER.ocr(self.device.image)
         try:
             result = re.findall(r'\d+', result)[0]