!2 change task list

app_dongri.py

@@ -179,21 +179,13 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
     print("collectArr", collectArr)
     times = 0
     while not event.is_set():
-        
+        task_queue.appendleft(task_information())
         if activity == 'lianmeng':
             task_queue.appendleft(task_activity_lianmeng())
-        task_queue.appendleft(task_information())
-        task_queue.appendleft(task_checkHelp(False))
-        task_queue.appendleft(task_useAnnimalSkill())
         #if not isSimple:
         #    task_queue.appendleft(task_paticipateInTeam())
         task_queue.appendleft(check_buildOrResearch())
-        task_queue.appendleft(task_cure())
         
-        task_queue.appendleft(task_checkDonata())
-        task_queue.appendleft(task_checkStoreRoom())
-        if not isSimple:
-            task_queue.appendleft(task_checkConfilits())
         if not isSimple:
             if isJina == 'jina':
                 task_queue.appendleft(task_fight_jina(isAddStrengh))
@@ -203,28 +195,43 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 task_queue.appendleft(task_fightMonster(isAddStrengh, False, isSimple))
             elif isJina == 'big_monster':
                 task_queue.appendleft(task_fightMonster(isAddStrengh, True, isSimple))
+        task_queue.appendleft(task_cure())
+        task_queue.appendleft(task_checkStoreRoom())
         task_queue.appendleft(task_collect(collectArr, isSimple))
         task_queue.appendleft(task_train(False))
-        task_queue.appendleft(task_collect(collectArr, isSimple))
-        task_queue.appendleft(task_train(False))
-        if isSimple:
-            task_queue.appendleft(check_buildOrResearch())
-        else:
+        if not isAddStrengh: # 如果不是添加体力，则添加一次采集
             task_queue.appendleft(task_collect(collectArr, isSimple))
         
+
         task_queue.appendleft(task_cure())
+        if isSimple:
+            task_queue.appendleft(check_buildOrResearch())
+        else:
+            if isJina == 'monster':
+                task_queue.appendleft(task_fightMonster(isAddStrengh, False, isSimple))
+            else:
+                task_queue.appendleft(task_collect(collectArr, isSimple))
         
 
         #task_queue.appendleft(task_waitTime())
         times += 1
-        if times == 5:
+        if times % 3 == 0:
             task_queue.appendleft(task_checkAdventure())
+            task_queue.appendleft(task_train(False))
+            task_queue.appendleft(task_checkDonata())
+            task_queue.appendleft(task_useAnnimalSkill())
+            task_queue.appendleft(task_checkHelp(False))
+            if not isSimple:
+                task_queue.appendleft(task_checkConfilits())
         if times == 10:
             handle_end_game()
             myTimeSleep(random.randint(1000, 2000), send_status)
             handle_restart_game()
         else:
-            myTimeSleep(random.randint(600, 1000), send_status)
+            if isJina == 'monster':
+                myTimeSleep(random.randint(400, 500), send_status)
+            else:
+                myTimeSleep(random.randint(600, 1000), send_status)
             
         
     task_queue.clear()

dongri_pic.py

@@ -65,6 +65,7 @@ class check_img:
     # = R'dongri_img\check\.png'
     move_down = (222,508,240,314)
     storeroom = R'dongri_img\check\storeroom.png'
+    storeroom2 = R'dongri_img\check\storeroom2.png'
     needgo = R'dongri_img\check\needgo.png'
     institude = R'dongri_img\check\institude.png'
     build_upgrade = R'dongri_img\check\build_upgrade.png'

dongri_task.py

@@ -238,8 +238,10 @@ class task_fight_yongbing(dongri_task):
         maxTryTimes = 3
         while maxTryTimes > 0:
             maxTryTimes -= 1
-            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 2, 1)
-            waitClickImg_noWait_withBool(monster_img.all_select, 2, 1)
+            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 1, 1)
+            waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
+            if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
+                break
 
         return True
 
@@ -290,8 +292,10 @@ class task_fight_jina(dongri_task):
         maxTryTimes = 3
         while maxTryTimes > 0:
             maxTryTimes -= 1
-            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 2, 1)
-            waitClickImg_noWait_withBool(monster_img.all_select, 2, 1)
+            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 1, 1)
+            waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
+            if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
+                break
 
         return True
         
@@ -348,8 +352,10 @@ class task_fightMonster(dongri_task):
         maxTryTimes = 3
         while maxTryTimes > 0:
             maxTryTimes -= 1
-            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 2, 1)
-            waitClickImg_noWait_withBool(monster_img.all_select, 2, 1)
+            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 1, 1)
+            waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
+            if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
+                break
 
         return True
         
@@ -414,8 +420,10 @@ class task_collect(dongri_task):
         maxTryTimes = 3
         while maxTryTimes > 0:
             maxTryTimes -= 1
-            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 2, 1)
-            waitClickImg_noWait_withBool(monster_img.all_select, 2, 1)
+            waitClickImg_withBool([monster_img.fight, monster_img.fight2], 1, 1)
+            waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
+            if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
+                break
         return True
         
 class task_train(dongri_task):
@@ -472,7 +480,7 @@ class task_checkStoreRoom(dongri_task):
             return False
         myTimeSleep_big()
         pcacc_mouse.quickclick_current()
-        if waitClickImg_noWait_withBool((check_img.storeroom, check_img.invite_free), 2, 1) == False:
+        if waitClickImg_noWait_withBool((check_img.storeroom, check_img.storeroom2, check_img.invite_free), 2, 1) == False:
             return False
         
         pcacc_mouse.quickclick_current()
@@ -730,14 +738,15 @@ class task_activity_lianmeng(dongri_task):
             if waitClickImg_noWait_withBool((special_activity_img.shili, special_activity_img.shili2), 2, 1) == True:
                 if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
                     return False
-                        
-        maxTryTimes = 2
-        while waitClickImg_noWait_withBool(special_activity_img.owning, 2, 1) == True:
-            waitClickImg_noWait_withBool(special_activity_img.refresh_task, 2, 1)
-            waitClickImg_noWait_withBool(special_activity_img.refresh, 2, 1)
-            maxTryTimes -= 1
-            if maxTryTimes <= 0:
-                break
+        
+        if waitFindImg_withBool(special_activity_img.shili, 2, 1) == False:
+            maxTryTimes = 2
+            while waitClickImg_noWait_withBool(special_activity_img.owning, 2, 1) == True:
+                waitClickImg_noWait_withBool(special_activity_img.refresh_task, 2, 1)
+                waitClickImg_noWait_withBool(special_activity_img.refresh, 2, 1)
+                maxTryTimes -= 1
+                if maxTryTimes <= 0:
+                    break
         return True