Procházet zdrojové kódy

fix(HeroTest): 对调skill6和skill7的文件和参数

- skill6: 默认技能 (253,128,39,63)
- skill7: 速度祝福 (427,356,62,38)
- 优先级:默认技能在速度祝福之前
lhye před 6 měsíci
rodič
revize
0ad30388a7

binární
tasks/HeroTest/as/as_hero2_skill6.png


binární
tasks/HeroTest/as/as_hero2_skill7.png


+ 6 - 6
tasks/HeroTest/as/image.json

@@ -353,19 +353,19 @@
   {
     "itemName": "hero2_skill6",
     "imageName": "as_hero2_skill6.png",
-    "roiFront": "427,356,62,38",
-    "roiBack": "48,342,1175,67",
+    "roiFront": "253,128,39,63",
+    "roiBack": "253,128,39,63",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "速度祝福"
+    "description": "默认技能"
   },
   {
     "itemName": "hero2_skill7",
     "imageName": "as_hero2_skill7.png",
-    "roiFront": "253,128,39,63",
-    "roiBack": "253,128,39,63",
+    "roiFront": "427,356,62,38",
+    "roiBack": "48,342,1175,67",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "默认技能"
+    "description": "速度祝福"
   }
 ]

+ 4 - 4
tasks/HeroTest/assets.py

@@ -97,10 +97,10 @@ class HeroTestAssets:
 	I_HERO2_SKILL5 = RuleImage(roi_front=(217,358,65,37), roi_back=(46,334,1148,81), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill5.png")
 	# 弥天祝福 
 	I_HERO2_SKILL3 = RuleImage(roi_front=(520,358,62,38), roi_back=(41,346,1172,63), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill3.png")
-	# 速度祝福 
-	I_HERO2_SKILL6 = RuleImage(roi_front=(427,356,62,38), roi_back=(48,342,1175,67), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill6.png")
-	# 默认技能 
-	I_HERO2_SKILL7 = RuleImage(roi_front=(253,128,39,63), roi_back=(253,128,39,63), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill7.png")
+	# 默认技能
+	I_HERO2_SKILL6 = RuleImage(roi_front=(253,128,39,63), roi_back=(253,128,39,63), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill6.png")
+	# 速度祝福
+	I_HERO2_SKILL7 = RuleImage(roi_front=(427,356,62,38), roi_back=(48,342,1175,67), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill7.png")
 
 
 	# Ocr Rule Assets

+ 6 - 3
tasks/HeroTest/script_task.py

@@ -151,11 +151,14 @@ class ScriptTask(GameUi, GeneralBattle, HeroTestAssets, SwitchSoul):
             self.I_HERO2_SKILL3,  # 弥天祝福
             self.I_HERO2_SKILL4,  # 叠辉祝福
             self.I_HERO2_SKILL5,  # 敛神祝福
-            self.I_HERO2_SKILL6,  # 速度祝福
-            self.I_HERO2_SKILL7,  # 默认技能
+            self.I_HERO2_SKILL6,  # 默认技能,选第一个祝福
+            self.I_HERO2_SKILL7,  # 速度祝福
         ]
         # TODO: PVP
-        pvp_skill = []
+        pvp_skill = [
+            self.I_HERO2_SKILL6,  # 默认技能,选第一个祝福
+            self.I_HERO2_SKILL7,  # 速度祝福
+        ]
         target_skill_dict: dict[SkillMode, list] = {
             SkillMode.PVE: pve_skill,
             SkillMode.PVP: pvp_skill,