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

fix(task): Ocr score error during dual

runhey 3 лет назад
Родитель
Сommit
f4e1fbe906
3 измененных файлов с 9 добавлено и 5 удалено
  1. 1 1
      tasks/Duel/assets.py
  2. 2 2
      tasks/Duel/duel/ocr.json
  3. 6 2
      tasks/Duel/script_task.py

+ 1 - 1
tasks/Duel/assets.py

@@ -52,7 +52,7 @@ class DuelAssets:
 	# 荣誉 
 	O_D_HONOR = RuleOcr(roi=(699,562,131,31), area=(699,562,131,31), mode="DigitCounter", method="Default", keyword="", name="d_honor")
 	# 分数 
-	O_D_SCORE = RuleOcr(roi=(699,514,65,33), area=(699,514,65,33), mode="Digit", method="Default", keyword="", name="d_score")
+	O_D_SCORE = RuleOcr(roi=(701,516,56,26), area=(701,516,56,26), mode="Digit", method="Default", keyword="", name="d_score")
 	# 手动 
 	O_D_HAND = RuleOcr(roi=(31,639,63,45), area=(31,639,63,45), mode="Single", method="Default", keyword="手动", name="d_hand")
 	# 自动 

+ 2 - 2
tasks/Duel/duel/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "d_score",
-    "roiFront": "699,514,65,33",
-    "roiBack": "699,514,65,33",
+    "roiFront": "701,516,56,26",
+    "roiBack": "701,516,56,26",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

+ 6 - 2
tasks/Duel/script_task.py

@@ -99,8 +99,12 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
         :param target: 目标分数
         :return:
         """
-        current_score = self.O_D_SCORE.ocr(self.device.image)
-        return current_score if current_score <= target else None
+        while 1:
+            self.screenshot()
+            current_score = self.O_D_SCORE.ocr(self.device.image)
+            if current_score < 1200 or current_score > 3000:
+                continue
+            return current_score if current_score <= target else None
 
     def duel_one(self, current_score: int, enable: bool=False,
                  mark_mode: GreenMarkType=GreenMarkType.GREEN_MAIN) -> bool: