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

Revert "fix(GeneralBattle): update OCR coordinates for battle preparation button"

This reverts commit e990180d38449633f0026c10b526a643862357da.
Migs 1 год назад
Родитель
Сommit
1c9fb7a465

+ 1 - 1
tasks/Component/GeneralBattle/assets.py

@@ -132,7 +132,7 @@ class GeneralBattleAssets:
 
 	# Ocr Rule Assets
 	# 准备 
-	O_BATTLE_PREPARE = RuleOcr(roi=(1130,561,92,51), area=(1130,561,92,51), mode="Single", method="Default", keyword="准备", name="battle_prepare")
+	O_BATTLE_PREPARE = RuleOcr(roi=(1122,546,92,51), area=(1122,546,92,51), mode="Single", method="Default", keyword="准备", name="battle_prepare")
 	# 预设,部分场景预设按钮上的文字为'预设'+数字,导致点击preset失败 
 	O_PRESET = RuleOcr(roi=(20,620,60,80), area=(20,620,60,80), mode="Single", method="Default", keyword="预", name="preset")
 

+ 3 - 3
tasks/Component/GeneralBattle/gb/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "battle_prepare",
-    "roiFront": "1130,561,92,51",
-    "roiBack": "1130,561,92,51",
+    "roiFront": "1122,546,92,51",
+    "roiBack": "1122,546,92,51",
     "mode": "Single",
     "method": "Default",
     "keyword": "准备",
@@ -11,7 +11,7 @@
   {
     "itemName": "preset",
     "roiFront": "20,620,60,80",
-    "roiBack": "20,620,60,80",
+    "roiBack":  "20,620,60,80",
     "mode": "Single",
     "method": "Default",
     "keyword": "预",

+ 2 - 2
tasks/Component/GeneralBattle/general_battle.py

@@ -45,14 +45,14 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
             self.check_buff(buff)
 
             # 点击准备按钮
-            self.ocr_appear(self.O_BATTLE_PREPARE)
+            self.wait_until_appear(self.I_PREPARE_HIGHLIGHT)
             self.wait_until_appear(self.I_BUFF)
             occur_prepare_button = False
             while 1:
                 self.screenshot()
                 if not self.appear(self.I_BUFF):
                     break
-                if self.ocr_appear_click(self.O_BATTLE_PREPARE, interval=1.5):
+                if self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=1.5):
                     occur_prepare_button = True
                     continue
                 # if occur_prepare_button and self.ocr_appear_click(self.O_BATTLE_PREPARE, interval=2):