Kaynağa Gözat

feat(Dokan): 添加道馆胜利场景检测并调整相关图像识别参数

- 在 dokan_scene.py 中添加 RYOU_DOKAN_SCENE_WIN 场景
- 更新 assets.py 和 image.json 中的 I_RYOU_DOKAN_WIN 图像识别参数
- 在 script_task.py 中处理新的胜利场景,优化战斗结束逻辑
- 调整 is_battle_end 函数中的战斗计数限制判断
ChengRanORZ 1 yıl önce
ebeveyn
işleme
fff13890f9

+ 1 - 1
tasks/Dokan/assets.py

@@ -81,7 +81,7 @@ class DokanAssets:
 	# 放弃突破 
 	I_DOKAN_ABANDONED_TOPPA_TITLE = RuleImage(roi_front=(1020,160,260,80), roi_back=(1020,160,260,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_title.png")
 	# 状态:道馆胜利 
-	I_RYOU_DOKAN_WIN = RuleImage(roi_front=(628,60,45,33), roi_back=(628,60,45,33), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_win.png")
+	I_RYOU_DOKAN_WIN = RuleImage(roi_front=(620,50,100,80), roi_back=(620,50,100,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_win.png")
 	# 状态:进入战斗,待开始,右下角图标。 
 	I_RYOU_DOKAN_IN_FIELD2 = RuleImage(roi_front=(1131,562,88,48), roi_back=(1131,562,88,48), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_in_field2.png")
 	# 馆主战,第一阵容 

+ 6 - 1
tasks/Dokan/dokan_scene.py

@@ -38,9 +38,11 @@ class DokanScene(Enum):
     RYOU_DOKAN_SCENE_MASTER_BATTLING = 14
     # 弹出窗口,道馆打完后,出现的排名
     RYOU_DOKAN_SCENE_TOPPA_RANK = 15
+    # 道馆胜利后,出现的界面
+    RYOU_DOKAN_SCENE_WIN=16
 
     # 阴阳寮神社界面
-    RYOU_DOKAN_SHENSHE = 16
+    RYOU_DOKAN_SHENSHE = 17
 
     # 正在查找道馆,处于地图界面
     RYOU_DOKAN_SCENE_FINDING_DOKAN = 97
@@ -131,6 +133,9 @@ class DokanSceneDetector(DokanAssets, BaseTask, GeneralBattleAssets):
         # 放弃后投票,右侧俩按钮: 保留赏金/再战道馆
         if self.appear(self.I_RYOU_DOKAN_FAILED_VOTE_KEEP_BOUNTY):
             return True, DokanScene.RYOU_DOKAN_SCENE_FAILED_VOTE
+        # 状态:胜利
+        if self.appear(self.I_RYOU_DOKAN_WIN):
+            return True, DokanScene.RYOU_DOKAN_SCENE_WIN
 
         # 状态:道馆已经结束 在寮境,底部有 "今日可挑战机会" 字样
         if (self.appear(self.I_RYOU_DOKAN_CENTER_TOP) and

+ 2 - 2
tasks/Dokan/res/image.json

@@ -209,8 +209,8 @@
   {
     "itemName": "ryou_dokan_win",
     "imageName": "res_ryou_dokan_win.png",
-    "roiFront": "628,60,45,33",
-    "roiBack": "628,60,45,33",
+    "roiFront": "620,50,100,80",
+    "roiBack": "620,50,100,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "状态:道馆胜利"

+ 5 - 2
tasks/Dokan/script_task.py

@@ -117,7 +117,8 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
             out_dokan_timer.clear()
 
             # 战斗结束
-            if current_scene == DokanScene.RYOU_DOKAN_SCENE_BATTLE_OVER:
+            if (current_scene == DokanScene.RYOU_DOKAN_SCENE_BATTLE_OVER or
+                    current_scene == DokanScene.RYOU_DOKAN_SCENE_WIN):
                 # 随便点击个地方退出奖励界面
                 self.click(self.C_DOKAN_TOPPA_RANK_CLOSE_AREA, interval=2)
                 sleep(2)
@@ -992,7 +993,8 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
 
             def is_battle_end() -> (bool, bool):
 
-                if battle_count_limit <= 0:
+                if battle_count_limit < 0:
+                    logger.info(f"battle_count_limit:{battle_count_limit}")
                     win = True
                     return win, True
 
@@ -1022,6 +1024,7 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
 
                 # 如果领奖励出现金币
                 if self.appear(GeneralBattle.I_REWARD_GOLD):
+                    logger.info("Reward gold")
                     win = True
                     return win, True