فهرست منبع

Merge pull request #346 from roarhill/dev

fix(Dokan): regenerate assets files
huangrunheng 2 سال پیش
والد
کامیت
455381e50a
3فایلهای تغییر یافته به همراه12 افزوده شده و 11 حذف شده
  1. 2 2
      tasks/Dokan/assets.py
  2. 4 4
      tasks/Dokan/res/ocr.json
  3. 6 5
      tasks/Dokan/script_task.py

+ 2 - 2
tasks/Dokan/assets.py

@@ -90,7 +90,7 @@ class DokanAssets:
 
 	# Ocr Rule Assets
 	# 道馆地图里找文字:万 
-	O_DOKAN_MAP = RuleOcr(roi=(1122,546,92,51), area=(1122,546,92,51), mode="Full", method="Default", keyword="万", name="dokan_map")
+	O_DOKAN_MAP = RuleOcr(roi=(270,130,740,460), area=(270,130,740,460), mode="Full", method="Default", keyword="万", name="dokan_map")
 	# 道馆里找文字:后开战 
 	O_DOKAN_GATHERING = RuleOcr(roi=(535,75,211,29), area=(535,75,211,29), mode="Single", method="Default", keyword="开战", name="dokan_gathering")
 	# 道馆里找文字:剩余突破时间 
@@ -98,6 +98,6 @@ class DokanAssets:
 	# 道馆里找文字:后挑战馆主 
 	O_DOKAN_BOSS_WAITING = RuleOcr(roi=(603,148,130,32), area=(603,148,130,32), mode="Single", method="Default", keyword="馆主", name="dokan_boss_waiting")
 	# 道馆里找文字:后关闭 
-	O_DOKAN_SUCCEEDED = RuleOcr(roi=(1122,546,92,51), area=(1122,546,92,51), mode="Full", method="Default", keyword="关闭", name="dokan_succeeded")
+	O_DOKAN_SUCCEEDED = RuleOcr(roi=(655,76,49,28), area=(655,76,49,28), mode="Full", method="Default", keyword="关闭", name="dokan_succeeded")
 
 

+ 4 - 4
tasks/Dokan/res/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "dokan_map",
-    "roiFront": "1122,546,92,51",
-    "roiBack": "1122,546,92,51",
+    "roiFront": "270,130,740,460",
+    "roiBack": "270,130,740,460",
     "mode": "Full",
     "method": "Default",
     "keyword": "万",
@@ -37,8 +37,8 @@
   },
   {
     "itemName": "dokan_succeeded",
-    "roiFront": "1122,546,92,51",
-    "roiBack": "1122,546,92,51",
+    "roiFront": "655,76,49,28",
+    "roiBack": "655,76,49,28",
     "mode": "Full",
     "method": "Default",
     "keyword": "关闭",

+ 6 - 5
tasks/Dokan/script_task.py

@@ -314,10 +314,11 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, DokanAssets):
                 break
 
             if self.appear_then_click(target_attack, interval=1.8):
+                self.attack_priority_selected = True
                 logger.info(f"selected attack priority: {attack_priority}")
-                max_try -= 1
+                break
 
-            self.attack_priority_selected = True
+            max_try -= 1
 
         return True
 
@@ -489,9 +490,9 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, DokanAssets):
         # if self.appear(self.I_RYOU_DOKAN_FAILED_VOTE_NO):
         #     return True, DokanScene.RYOU_DOKAN_SCENE_FAILED_VOTE_NO
 
-        # 状态:道馆已经结束
-        # if self.ocr_appear(self.O_DOKAN_SUCCEEDED):
-        if self.appear(self.I_RYOU_DOKAN_FINISHED, threshold=0.8):
+        # 状态:道馆已经结束,图片位置会偏移,换OCR
+        if self.ocr_appear(self.O_DOKAN_SUCCEEDED):
+        # if self.appear(self.I_RYOU_DOKAN_FINISHED, threshold=0.8):
             return True, DokanScene.RYOU_DOKAN_SCENE_FINISHED
 
         return False, DokanScene.RYOU_DOKAN_SCENE_UNKNOWN