From 4cc4647705933b892c27295974a923ddacd1cbb1 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sun, 24 Sep 2023 15:58:31 +0800
Subject: [PATCH] Fix: Skill switch is clicked before appeared

---
 tasks/combat/skill.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tasks/combat/skill.py b/tasks/combat/skill.py
index d8403002e..843526a62 100644
--- a/tasks/combat/skill.py
+++ b/tasks/combat/skill.py
@@ -51,6 +51,10 @@ class CombatSkill(UI):
                     logger.info(f'Skill used: {button}')
                     break
 
+    def _is_skill_active(self, button):
+        flag = self.image_color_count(button, color=(220, 196, 145), threshold=221, count=50)
+        return flag
+
     def _skill_switch(self, check_button, click_button, skip_first_screenshot=True):
         """
         Switch to A or E
@@ -64,11 +68,11 @@ class CombatSkill(UI):
                 self.device.screenshot()
 
             # Raw brown border
-            if self.image_color_count(check_button, color=(220, 196, 145), threshold=221, count=50):
+            if self._is_skill_active(check_button):
                 logger.info(f'Skill switched: {check_button}')
                 break
 
-            if self.is_in_skill():
+            if self.is_in_skill() and (self._is_skill_active(CHECK_A) or self._is_skill_active(CHECK_E)):
                 if interval.reached():
                     self.device.click(click_button)
                     interval.reset()