huangrunheng před 2 roky
rodič
revize
2967bdce82

+ 3 - 3
dev_tools/assets_test.py

@@ -34,10 +34,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 
 
 # 图片文件路径 可以是相对路径
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = r"C:\Users\萌萌哒\Desktop\384653401-2ed53690-bf55-41b9-ac45-6d984d6e9f05.png"
+IMAGE_FILE = r"C:\Users\萌萌哒\Desktop\379738421-b29c0114-7f25-4d89-a32a-20f06cd4b77c.png"
 if __name__ == '__main__':
 if __name__ == '__main__':
-    from tasks.GlobalGame.assets import GlobalGameAssets
-    targe = GlobalGameAssets.I_UI_BACK_RED
+    from tasks.Duel.assets import DuelAssets
+    targe = DuelAssets.I_D_TEAM
     print(detect_image(IMAGE_FILE, targe))
     print(detect_image(IMAGE_FILE, targe))
 
 
     # ocr demo
     # ocr demo

+ 1 - 1
tasks/Duel/assets.py

@@ -17,7 +17,7 @@ class DuelAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 点击阵容 
 	# 点击阵容 
-	I_D_TEAM = RuleImage(roi_front=(813,284,34,74), roi_back=(813,284,34,74), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_team.png")
+	I_D_TEAM = RuleImage(roi_front=(813,288,34,74), roi_back=(785,259,115,119), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_team.png")
 	# 一键切换所有的御魂 
 	# 一键切换所有的御魂 
 	I_D_TEAM_SWTICH = RuleImage(roi_front=(1082,85,38,41), roi_back=(1082,85,38,41), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_team_swtich.png")
 	I_D_TEAM_SWTICH = RuleImage(roi_front=(1082,85,38,41), roi_back=(1082,85,38,41), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_team_swtich.png")
 	# 观战 
 	# 观战 

+ 2 - 2
tasks/Duel/duel/image.json

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "d_team",
     "itemName": "d_team",
     "imageName": "duel_d_team.png",
     "imageName": "duel_d_team.png",
-    "roiFront": "813,284,34,74",
-    "roiBack": "813,284,34,74",
+    "roiFront": "813,288,34,74",
+    "roiBack": "785,259,115,119",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "点击阵容"
     "description": "点击阵容"

+ 1 - 1
tasks/Duel/script_task.py

@@ -61,7 +61,7 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
         """
         """
         if screenshot:
         if screenshot:
             self.screenshot()
             self.screenshot()
-        return self.appear(self.I_D_HELP)
+        return self.appear(self.I_D_HELP) or self.appear(self.I_D_CELEB_STAR) or self.appear(self.I_D_CELEB_HONOR)
 
 
     def switch_all_soul(self):
     def switch_all_soul(self):
         """
         """