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

Merge pull request #1923 from Enough1122/duel-share-image

fix(Duel): detect MVP share page via share-button image rule
huangrunheng 1 месяц назад
Родитель
Сommit
a39e73752a

+ 2 - 0
tasks/Duel/assets.py

@@ -60,6 +60,8 @@ class DuelAssets:
 	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")
 	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")
+	# 斗技胜利MVP分享页右下分享按钮 
+	I_D_VICTORY_SHARE = RuleImage(roi_front=(1100,580,90,120), roi_back=(1080,560,130,160), threshold=0.8, method="Masked template matching", file="./tasks/Duel/duel/duel_d_victory_share.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

BIN
tasks/Duel/duel/duel_d_victory_share.png


BIN
tasks/Duel/duel/duel_d_victory_share_mask.png


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

@@ -187,5 +187,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "队伍试用"
     "description": "队伍试用"
+  },
+  {
+    "itemName": "d_victory_share",
+    "imageName": "duel_d_victory_share.png",
+    "roiFront": "1100,580,90,120",
+    "roiBack": "1080,560,130,160",
+    "method": "Masked template matching",
+    "threshold": 0.8,
+    "description": "斗技胜利MVP分享页右下分享按钮"
   }
   }
 ]
 ]

+ 2 - 1
tasks/Duel/script_task.py

@@ -303,7 +303,8 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, DuelAssets, SwitchOnmyoji):
             self.appear(self.I_D_CHECK_BAN)
             self.appear(self.I_D_CHECK_BAN)
 
 
     def is_battle_win(self) -> bool:
     def is_battle_win(self) -> bool:
-        return self.appear(self.I_WIN) or self.appear(self.I_D_VICTORY)
+        return self.appear(self.I_WIN) or self.appear(self.I_D_VICTORY) or \
+            self.appear(self.I_D_VICTORY_SHARE)
 
 
     def is_battle_lose(self) -> bool:
     def is_battle_lose(self) -> bool:
         return self.appear(self.I_FALSE) or self.appear(self.I_D_FAIL)
         return self.appear(self.I_FALSE) or self.appear(self.I_D_FAIL)