Przeglądaj źródła

fix: general battle change preset

Azure 1 rok temu
rodzic
commit
217539a8ce

+ 2 - 0
tasks/Component/GeneralBattle/assets.py

@@ -145,6 +145,8 @@ class GeneralBattleAssets:
 	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")
+    # 预设
+	O_PRESET_FULL = RuleOcr(roi=(20,620,60,80), area=(20,620,60,80), mode="Single", method="Default", keyword="预设", name="preset")
 
 
 	# Swipe Rule Assets

+ 9 - 0
tasks/Component/GeneralBattle/gb/ocr.json

@@ -16,5 +16,14 @@
     "method": "Default",
     "keyword": "预",
     "description": "预设,部分场景预设按钮上的文字为'预设'+数字,导致点击preset失败"
+  },
+  {
+    "itemName": "preset_full",
+    "roiFront": "20,620,60,80",
+    "roiBack":  "20,620,60,80",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "预设",
+    "description": "预设"
   }
 ]

+ 3 - 0
tasks/Component/GeneralBattle/general_battle.py

@@ -317,6 +317,9 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
             if self.ocr_appear(self.O_PRESET):
                 self.click(self.O_PRESET, interval=1)
                 continue
+            if self.ocr_appear(self.O_PRESET_FULL):
+                self.click(self.O_PRESET_FULL, interval=1)
+                continue
         logger.info("Click preset button")
 
         def get_unselect_color(tmp1, tmp2, tmp3, size):