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

feat: climb app100 change to image recognition

Azure 1 год назад
Родитель
Сommit
e54b5e16f2

BIN
tasks/ActivityShikigami/as/as_check_ap100.png


+ 9 - 0
tasks/ActivityShikigami/as/image.json

@@ -268,5 +268,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "门票活动定位"
+  },
+  {
+    "itemName": "check_ap100",
+    "imageName": "as_check_ap100.png",
+    "roiFront": "971,575,96,100",
+    "roiBack": "934,537,166,167",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "100体爬塔标识"
   }
 ]

+ 0 - 9
tasks/ActivityShikigami/as/ocr.json

@@ -79,14 +79,5 @@
     "method": "Default",
     "keyword": "将魂试炼",
     "description": "进入100体活动标识"
-  },
-  {
-    "itemName": "check_ap100",
-    "roiFront": "89,12,128,44",
-    "roiBack": "67,0,166,69",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "将魂试炼",
-    "description": "100体活动界面标识"
   }
 ]

+ 2 - 4
tasks/ActivityShikigami/assets.py

@@ -118,8 +118,8 @@ class ActivityShikigamiAssets:
 	I_ACT_MAP_SWITCH = RuleImage(roi_front=(1196,303,59,48), roi_back=(1174,263,104,118), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_act_map_switch.png")
 	# 门票活动定位 
 	I_PASS_ACT_LOCAT = RuleImage(roi_front=(1214,395,29,31), roi_back=(1179,373,100,86), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_pass_act_locat.png")
-	# 100体爬塔活动标识 
-	I_CHECK_AP100 = RuleImage(roi_front=(1182,652,73,32), roi_back=(1141,627,135,81), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_ap100.png")
+	# 100体爬塔活动标识
+	I_CHECK_AP100 = RuleImage(roi_front=(971,575,96,100), roi_back=(934,537,166,167), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_ap100.png")
 
 
 	# Ocr Rule Assets
@@ -141,7 +141,5 @@ class ActivityShikigamiAssets:
 	O_REMAIN_AP100 = RuleOcr(roi=(922,21,112,39), area=(913,8,131,62), mode="Digit", method="Default", keyword="", name="remain_ap100")
 	# 进入100体活动标识 
 	O_ENTER_AP100 = RuleOcr(roi=(72,187,95,32), area=(7,172,256,108), mode="Single", method="Default", keyword="将魂试炼", name="enter_ap100")
-	# 100体活动界面标识 
-	O_CHECK_AP100 = RuleOcr(roi=(89,12,128,44), area=(67,0,166,69), mode="Single", method="Default", keyword="将魂试炼", name="check_ap100")
 
 

+ 3 - 1
tasks/GameUi/game_ui.py

@@ -3,6 +3,8 @@
 # github https://github.com/runhey
 import time
 from time import sleep
+
+import random
 from collections import deque
 from module.atom.image import RuleImage
 from module.atom.list import RuleList
@@ -269,7 +271,7 @@ class GameUi(BaseTask, GameUiAssets):
             if timeout_timer.reached():
                 return False
             # 等待当前页面出现
-            self.ui_wait_until_appear(current_page)
+            self.ui_wait_until_appear(current_page, interval=random.uniform(0.6, 1.2))
             logger.info(f'Page switch: {current_page} -> {next_page}')
             # 执行附加操作
             if current_page.additional:

+ 1 - 1
tasks/GameUi/page.py

@@ -218,7 +218,7 @@ page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap
 # page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
 # page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
 # 100体爬塔活动界面
-page_climb_act_ap100 = Page(asa.O_CHECK_AP100)
+page_climb_act_ap100 = Page(asa.I_CHECK_AP100)
 page_climb_act_2.link(button=asa.O_ENTER_AP100, destination=page_climb_act_ap100)
 page_climb_act_ap100.link(button=G.I_BACK_Y, destination=page_climb_act_2)
 # 爬塔活动boss战界面