!2 fight bears can use annimalskill now

app_dongri.py

@@ -315,6 +315,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         if isSimple == False and is_within_n_minutes(get_todo_time("巨熊行动"), 20, 30):
             if len(task_queue) < 5:
                 task_queue.appendleft(task_returnAllLine())
+                task_queue.appendleft(task_useAnnimalSkill(True))
                 task_queue.appendleft(task_paticipateInTeam())
                 task_queue.appendleft(task_paticipateInTeam())
                 task_queue.appendleft(task_paticipateInTeam())

dongri_pic.py

@@ -132,6 +132,10 @@ class check_img:
     wolf_skill = R'dongri_img\check\wolf_skill.png'
     elephant_skill = R'dongri_img\check\elephant_skill.png'
     lu_skill = R'dongri_img\check\lu_skill.png'
+    bird_skill = R'dongri_img\check\bird_skill.png'
+    fightWolf_skill = R'dongri_img\check\fightWolf_skill.png'
+    bear_skill = R'dongri_img\check\bear_skill.png'
+    lion_skill = R'dongri_img\check\lion_skill.png'
     use = R'dongri_img\check\use.png'
     use2 = R'dongri_img\check\use2.png'
     pack = R'dongri_img\check\pack.png'

dongri_task.py

@@ -1115,15 +1115,22 @@ class task_cure(dongri_task):
         return True
 
 class task_useAnnimalSkill(dongri_task):
-    def __init__(self):
+    def __init__(self, isFight = False):
+        self.isFight = isFight
         super().__init__(f"使用动物技能")
     def run(self):
         basic_operate.go_outside()
         if waitClickImg_noWait_withBool(check_img.annimal_skill, 2, 1) == False:
             return False
+        research_skill = [check_img.wolf_skill, check_img.elephant_skill, check_img.lu_skill]
+        fight_skill = [check_img.fightWolf_skill, check_img.bird_skill, check_img.bear_skill, check_img.lion_skill]
         
-        if waitClickImg_noWait_withBool((check_img.wolf_skill, check_img.elephant_skill, check_img.lu_skill), 2, 1) == False:
-            return False
+        if self.isFight == False:
+            if waitClickImg_noWait_withBool(research_skill, 2, 1) == False:
+                return False
+        else:
+            if waitClickImg_noWait_withBool(fight_skill, 2, 1) == False:
+                return False
         
         if waitClickImg_noWait_withBool((check_img.use, check_img.use2), 2, 1) == False:
             return False