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

Merge pull request #655 from ChengRanORZ/fix_autodokan

Fix autodokan
huangrunheng 1 год назад
Родитель
Сommit
97c95de8be

+ 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_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

+ 2 - 2
tasks/Dokan/dokan_scene.py

@@ -39,7 +39,7 @@ class DokanScene(Enum):
     # 弹出窗口,道馆打完后,出现的排名
     RYOU_DOKAN_SCENE_TOPPA_RANK = 15
     # 道馆胜利后,出现的界面
-    RYOU_DOKAN_SCENE_WIN=16
+    RYOU_DOKAN_SCENE_WIN = 16
 
     # 阴阳寮神社界面
     RYOU_DOKAN_SHENSHE = 17
@@ -134,7 +134,7 @@ 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):
+        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
 
         # 状态:道馆已经结束 在寮境,底部有 "今日可挑战机会" 字样

+ 3 - 0
tasks/Dokan/ex_green_mark.py

@@ -184,6 +184,9 @@ class ExtendGreenMark(GeneralBattle):
         for name in name_list:
             # 此处为了获取到OCR模型,随机选择一个了RuleOcr对象,可以使用任意的RuleOcr对象
             res_list = self.O_EXP_50.model.detect_and_ocr(img, 0.7)
+            # 增加日志输出,方便纠错
+            output = [item.ocr_text for item in res_list]
+            logger.info(f"detect res_list:{output}")
             res = [item for item in res_list if similarity(item.ocr_text, name) > 0.5]
             res = sorted(res, key=lambda x: x.score)
             if len(res) <= 0:

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

@@ -511,5 +511,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "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


+ 13 - 1
tasks/Dokan/script_task.py

@@ -111,8 +111,8 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
                 if out_dokan_timer.reached():
                     logger.warning("long hours away from dokan,exit")
                     break
-                sleep(2)
                 logger.info("out of dokan scene,wait for 2 seconds")
+                sleep(2)
                 continue
             out_dokan_timer.clear()
 
@@ -1028,6 +1028,14 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
                     win = True
                     return win, True
 
+                # 如果出现 寮境顶部“道馆突破”字样,表示已不再战斗中
+                # 可能是截图时绿标,导致没有检测到战斗结束
+                if self.appear(self.I_RYOU_DOKAN_CENTER_TOP):
+                    logger.info("Exit Battle already")
+                    # 因为不确定战斗成功还是失败,姑且当作成功
+                    win = True
+                    return win, True
+
                 return False, False
 
             win, is_battle_end_and_exit = is_battle_end()
@@ -1048,6 +1056,10 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
 
             # 打完一个小朋友,自动进入下一个小朋友
             if self.appear(self.I_RYOU_DOKAN_IN_FIELD):
+                # 在此处判断战斗次数,防止开启额外的战斗
+                if battle_count_limit <= 0:
+                    win = True
+                    break
                 self.device.click_record_clear()
                 self.device.stuck_record_clear()