Merge branch 'master' of http://1.94.225.168:6602/pcacc/yys_auto

app_dongri.py

@@ -32,6 +32,7 @@ class GlobalState:
     g_switch = False
     g_isRestart = True
     last_change_time = time.time()
+    g_firstRunBear = True
 
 @app.after_request
 def add_no_cache_header(response):
@@ -281,15 +282,22 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         if isSimple == False and is_within_n_minutes(get_todo_time("巨熊行动"), 30, 35):
             print("in fight bear")
             if len(GlobalState.task_queue) < 5:
-                start_recording()
-                GlobalState.task_queue.appendleft(task_returnAllLine())
-                GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam2(not GlobalState.g_switch))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam2(not GlobalState.g_switch))
+                if GlobalState.g_firstRunBear:
+                    GlobalState.g_firstRunBear = False
+                    start_recording()
+                    GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
+                    GlobalState.task_queue.appendleft(task_returnAllLine())
+                    GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
+                    GlobalState.task_queue.appendleft(task_returnAllLine())
+                    GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
+                    GlobalState.task_queue.appendleft(task_returnAllLine())
+                    GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam2(not GlobalState.g_switch))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam2(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(False))

dongri_pic.py

@@ -86,6 +86,7 @@ class train_img:
 class check_img:
     # = R'dongri_img\check\.png'
     move_down = (222,508,240,314)
+    move_down_big = (285, 708, 292, 196)
     storeroom = R'dongri_img\check\storeroom.png'
     storeroom2 = R'dongri_img\check\storeroom2.png'
     needgo = R'dongri_img\check\needgo.png'

dongri_task.py

@@ -1109,7 +1109,7 @@ class task_paticipateInTeam(dongri_task):
             myTimeSleep(0.02)
         
         ret = False
-        for i in range(dragTimes):
+        for i in range(dragTimes*2):
             ret = waitClickImg_noWait_withBool(monster_img.participate, 1, 0, True)
             if ret == True:
                 break
@@ -1121,14 +1121,21 @@ class task_paticipateInTeam(dongri_task):
         
         waitClickImg_noWait_withBool(self.line, 0.1, 1)
 
-        if waitFindImg_withBool(special_activity_img.power0, 0.1, 0) == False:# 实力不为0
-            if self.checkPower:
-                if waitFindImg_withBool(check_img.enough_soilder, 1, 0) == False:
-                    return False
-            
-            waitClickImg_withBool([monster_img.fight, monster_img.fight2, monster_img.fight3], 1, 0)
-            return True
-        return False        
+                if waitFindImg_withBool(special_activity_img.power0, 0.1, 0) == False:# 实力不为0
+                    if self.checkPower:
+                        if waitFindImg_withBool(check_img.enough_soilder, 1, 0) == False:
+                            return False
+                
+                    waitClickImg_withBool([monster_img.fight, monster_img.fight2, monster_img.fight3], 1, 0)
+                    if waitFindImg_withBool(check_img.auto_confilit, 2, 0) == False:
+                        return False
+            else:
+                yys_dragAuto(check_img.move_down_big)
+                myTimeSleep_small()
+        
+        
+        return True
+     
 
 class task_cure(dongri_task):
     def __init__(self, continueCure = False, cureNum = None):