!2 fix fight bears

app_dongri.py

@@ -239,8 +239,10 @@ def auto_participate():
 
     while not event.is_set():
         if len(task_queue) < 4:
+            task_queue.appendleft(task_useAnnimalSkill(True))
+            task_queue.appendleft(task_paticipateInTeam(False))
             task_queue.appendleft(task_paticipateInTeam())
-            task_queue.appendleft(task_paticipateInTeam())
+            task_queue.appendleft(task_paticipateInTeam(False))
             task_queue.appendleft(task_paticipateInTeam())
         myTimeSleep_big()
         # 每次循环检查已用时间
@@ -302,15 +304,15 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 start_recording()
                 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())
-                task_queue.appendleft(task_paticipateInTeam())
-                task_queue.appendleft(task_paticipateInTeam())
-                task_queue.appendleft(task_paticipateInTeam())
-                task_queue.appendleft(task_paticipateInTeam())
-                task_queue.appendleft(task_paticipateInTeam())
-                task_queue.appendleft(task_paticipateInTeam())
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(not g_switch))
                 
             myTimeSleep_big()
             send_status(f'巨熊行动中')

dongri_task.py

@@ -1023,7 +1023,7 @@ class task_returnAllLine(dongri_task):
         return True
 
 class task_paticipateInTeam(dongri_task):
-    def __init__(self):
+    def __init__(self, checkPower=True):
         typeArr = [1,3,4]
         type = typeArr[random.randint(0, len(typeArr) - 1)]
         if type == 1:
@@ -1034,9 +1034,12 @@ class task_paticipateInTeam(dongri_task):
             self.line = monster_img.line3
         elif type == 4:
             self.line = monster_img.line4
-        super().__init__(f"参与队伍{type}")
+        self.checkPower = checkPower
+        hint = "&检查实力"
+        if checkPower == False:
+            hint = "&不检查"
+        super().__init__(f"参与队伍{type}{hint}")
     def run(self):
-        
         basic_operate.go_outside()
         if waitClickImg_noWait_withBool(check_img.conflits, 2, 1) == False:
             return False
@@ -1055,9 +1058,10 @@ class task_paticipateInTeam(dongri_task):
         while maxTryTimes > 0:
             maxTryTimes -= 1
             if waitFindImg_withBool(special_activity_img.power0, 1, 0.5) == False:# 实力不为0
-                powerCount = task_checkPower().run()
-                if powerCount < 41234567:
-                    return False
+                if self.checkPower:
+                    powerCount = task_checkPower().run()
+                    if powerCount < 41234567:
+                        return False
                 
                 waitClickImg_withBool([monster_img.fight, monster_img.fight2, monster_img.fight3], 1, 0.5)
                 return True