Преглед изворни кода

fix(Dokan): 添加道馆攻破后夺得资金的识别

由于原先的dokan_win偶尔会被遮挡导致识别场景失败,故增加此
ChengRanORZ пре 1 година
родитељ
комит
018e86819d

+ 2 - 0
tasks/Dokan/assets.py

@@ -148,6 +148,8 @@ class DokanAssets:
 	I_RYOU_DOKAN_CENTER_TOP = RuleImage(roi_front=(500,20,300,70), roi_back=(500,20,300,70), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_top.png")
 	I_RYOU_DOKAN_CENTER_TOP = RuleImage(roi_front=(500,20,300,70), roi_back=(500,20,300,70), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_top.png")
 	# 左上角退出按钮- 
 	# 左上角退出按钮- 
 	I_RYOU_DOKAN_DOKAN_QUIT = RuleImage(roi_front=(0,2,80,80), roi_back=(0,2,80,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_dokan_quit.png")
 	I_RYOU_DOKAN_DOKAN_QUIT = RuleImage(roi_front=(0,2,80,80), roi_back=(0,2,80,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_dokan_quit.png")
+	# 道馆攻破后夺得资金界面 
+	I_RYOU_DOKAN_SPOILS_OF_DOKAN = RuleImage(roi_front=(480,400,400,100), roi_back=(480,400,400,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_spoils_of_dokan.png")
 
 
 
 
 	# List Rule Assets
 	# List Rule Assets

+ 2 - 2
tasks/Dokan/dokan_scene.py

@@ -39,7 +39,7 @@ class DokanScene(Enum):
     # 弹出窗口,道馆打完后,出现的排名
     # 弹出窗口,道馆打完后,出现的排名
     RYOU_DOKAN_SCENE_TOPPA_RANK = 15
     RYOU_DOKAN_SCENE_TOPPA_RANK = 15
     # 道馆胜利后,出现的界面
     # 道馆胜利后,出现的界面
-    RYOU_DOKAN_SCENE_WIN=16
+    RYOU_DOKAN_SCENE_WIN = 16
 
 
     # 阴阳寮神社界面
     # 阴阳寮神社界面
     RYOU_DOKAN_SHENSHE = 17
     RYOU_DOKAN_SHENSHE = 17
@@ -134,7 +134,7 @@ class DokanSceneDetector(DokanAssets, BaseTask, GeneralBattleAssets):
         if self.appear(self.I_RYOU_DOKAN_FAILED_VOTE_KEEP_BOUNTY):
         if self.appear(self.I_RYOU_DOKAN_FAILED_VOTE_KEEP_BOUNTY):
             return True, DokanScene.RYOU_DOKAN_SCENE_FAILED_VOTE
             return True, DokanScene.RYOU_DOKAN_SCENE_FAILED_VOTE
         # 状态:胜利
         # 状态:胜利
-        if self.appear(self.I_RYOU_DOKAN_WIN):
+        if self.appear(self.I_RYOU_DOKAN_WIN) or self.appear(self.I_RYOU_DOKAN_SPOILS_OF_DOKAN):
             return True, DokanScene.RYOU_DOKAN_SCENE_WIN
             return True, DokanScene.RYOU_DOKAN_SCENE_WIN
 
 
         # 状态:道馆已经结束 在寮境,底部有 "今日可挑战机会" 字样
         # 状态:道馆已经结束 在寮境,底部有 "今日可挑战机会" 字样

+ 9 - 0
tasks/Dokan/res/image.json

@@ -511,5 +511,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "左上角退出按钮-"
     "description": "左上角退出按钮-"
+  },
+  {
+    "itemName": "ryou_dokan_spoils_of_dokan",
+    "imageName": "res_ryou_dokan_spoils_of_dokan.png",
+    "roiFront": "480,400,400,100",
+    "roiBack":  "480,400,400,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "道馆攻破后夺得资金界面"
   }
   }
 ]
 ]

BIN
tasks/Dokan/res/res_ryou_dokan_spoils_of_dokan.png