Przeglądaj źródła

Merge pull request #1750 from yEs1do/fix(Duel_Try)

fix(Duel_Try): 添加队伍试用图像资源及相关规则
huangrunheng 2 miesięcy temu
rodzic
commit
d940ccaa77

+ 2 - 0
tasks/Duel/assets.py

@@ -58,6 +58,8 @@ class DuelAssets:
 	I_D_CHECK_BAN = RuleImage(roi_front=(611,36,56,62), roi_back=(590,14,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_check_ban.png")
 	I_D_CHECK_BAN = RuleImage(roi_front=(611,36,56,62), roi_back=(590,14,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_check_ban.png")
 	# 斗技荣誉图标 
 	# 斗技荣誉图标 
 	I_DUEL_HONOR = RuleImage(roi_front=(211,636,20,20), roi_back=(200,601,130,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_duel_honor.png")
 	I_DUEL_HONOR = RuleImage(roi_front=(211,636,20,20), roi_back=(200,601,130,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_duel_honor.png")
+	# 队伍试用 
+	I_D_TRY = RuleImage(roi_front=(667,356,111,30), roi_back=(667,356,111,30), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_try.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

BIN
tasks/Duel/duel/duel_d_try.png


+ 9 - 0
tasks/Duel/duel/image.json

@@ -178,5 +178,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "斗技荣誉图标"
     "description": "斗技荣誉图标"
+  },
+  {
+    "itemName": "d_try",
+    "imageName": "duel_d_try.png",
+    "roiFront": "667,356,111,30",
+    "roiBack": "667,356,111,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "队伍试用"
   }
   }
 ]
 ]

+ 2 - 0
tasks/GameUi/page.py

@@ -5,6 +5,7 @@ import random
 import traceback
 import traceback
 from module.atom.click import RuleClick
 from module.atom.click import RuleClick
 from tasks.BondlingFairyland.assets import BondlingFairylandAssets
 from tasks.BondlingFairyland.assets import BondlingFairylandAssets
+from tasks.Duel.assets import DuelAssets
 from tasks.GlobalGame.assets import GlobalGameAssets as GGA
 from tasks.GlobalGame.assets import GlobalGameAssets as GGA
 from tasks.GameUi.assets import GameUiAssets as G
 from tasks.GameUi.assets import GameUiAssets as G
 from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
 from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
@@ -123,6 +124,7 @@ page_exploration.link(button=G.I_EXPLORATION_GOTO_HERO_TEST, destination=page_he
 # ************************************* 町中部分 *****************************************#
 # ************************************* 町中部分 *****************************************#
 # 斗技 duel
 # 斗技 duel
 page_duel = Page(G.I_CHECK_DUEL)
 page_duel = Page(G.I_CHECK_DUEL)
+page_duel.additional = [DuelAssets.I_D_TRY]
 page_duel.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_duel.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_DUEL, destination=page_duel)
 page_town.link(button=G.I_TOWN_GOTO_DUEL, destination=page_duel)
 # 逢魔之时 demon_encounter
 # 逢魔之时 demon_encounter