!2 information auto add strength

app_dongri.py

@@ -204,9 +204,6 @@ def auto_participate():
             handle_restart_game()
             break
 
-
-
-
 def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True, isDailyConfig = False, train_type = 'None', always = False):  
     global g_times
     collectArr = [int(x) for x in isMaxCollect.split(",")]
@@ -243,9 +240,6 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 write_Dailycfg(config)
         
 
-        
-
-
         task_queue.appendleft(task_information())
         if activity == 'lianmeng':
             task_queue.appendleft(task_activity_lianmeng())
@@ -253,6 +247,8 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_cure(True))
         task_queue.appendleft(check_buildOrResearch())
         
+        task_queue.appendleft(task_cure(False))
+        task_queue.appendleft(task_checkStoreRoom())
         if not isSimple:
             if isJina == 'jina':
                 task_queue.appendleft(task_fight_jina(isAddStrengh))
@@ -262,8 +258,6 @@ 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(False))
-        task_queue.appendleft(task_checkStoreRoom())
         task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         task_queue.appendleft(task_train(train_type))
         task_queue.appendleft(task_checkActivities())
@@ -281,7 +275,6 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         
 
-        #task_queue.appendleft(task_waitTime())
         g_times += 1
         if g_times % 3 == 0:
             task_queue.appendleft(task_checkDonata())

dongri_task.py

@@ -665,10 +665,20 @@ class check_buildOrResearch(dongri_task):
         return True
                 
 class task_information(dongri_task):
-    def __init__(self):
+    def __init__(self, isAddStrengh = False):
         super().__init__(f"检查情报")
+        self.isAddStrengh = isAddStrengh
     def run(self):
         basic_operate.go_outside()
+
+        if False == waitFindImg_withBool(monster_img.enough_strengh, 2, 1):
+            if self.add_strengh:
+                basic_operate.add_strength()
+                basic_operate.go_outside()
+            else:
+                print("没有足够的体力了")
+                return False
+
         if waitClickImg_noWait_withBool(information_img.information, 1, 1) == False:
             return False
         
@@ -678,9 +688,6 @@ class task_information(dongri_task):
             if waitClickImg_noWait_withBool(information_img.explore, 1, 1) == False:
                 return False
             if waitClickImg_noWait_withBool(information_img.hero_fight, 1, 1) == False:
-                waitClickImg_noWait(information_img.add_strength, 1, 1)
-                waitClickImg_noWait(information_img.add_strength, 1, 1)
-                waitClickImg_noWait(information_img.add_strength, 1, 1)
                 return False
             
             myTimeSleep_big()
@@ -690,9 +697,6 @@ class task_information(dongri_task):
                 return False
             if waitClickImg_noWait_withBool(information_img.survive, 1, 1) == False:
                 return False
-            waitClickImg_noWait(information_img.add_strength, 1, 1)
-            waitClickImg_noWait(information_img.add_strength, 1, 1)
-            waitClickImg_noWait(information_img.add_strength, 1, 1)
             return True
         elif waitClickImg_noWait_withBool([information_img.wolf0, information_img.wolf1, information_img.wolf2], 0.5, 0.5):
             if waitClickImg_noWait_withBool(information_img.gotosee, 1, 1) == False:
@@ -713,9 +717,6 @@ class task_information(dongri_task):
                 if False == waitClickImg_noWait_withBool(monster_img.all_select, 1, 1):
                     break
             
-            waitClickImg_noWait(information_img.add_strength, 1, 1)
-            waitClickImg_noWait(information_img.add_strength, 1, 1)
-            waitClickImg_noWait(information_img.add_strength, 1, 1)
             return True
         else:
             return False