!2 add shili 860

app_dongri.py

@@ -242,7 +242,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 write_Dailycfg(config)
         
 
-        task_queue.appendleft(task_checkActivities())
+        
 
 
         task_queue.appendleft(task_information())
@@ -263,6 +263,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = 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())
         if not isAddStrengh: # 如果不是添加体力，则添加一次采集
             task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         

dongri_task.py

@@ -805,7 +805,7 @@ class task_activity_lianmeng(dongri_task):
         waitClickImg_noWait_withBool(special_activity_img.task_done, 2, 1)
         
         if waitFindImg_withBool(special_activity_img.doing_task, 2, 1) == False:
-            if waitClickImg_noWait_withBool((special_activity_img.shili_120), 2, 1) == True:
+            if waitClickImg_noWait_withBool((special_activity_img.shili_120, special_activity_img.shili_860), 2, 1) == True:
                 if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
                     return False
         
@@ -884,7 +884,7 @@ class task_checkActivities(dongri_task):
 
 
 if __name__ == '__main__':
-    task_checkActivities().run()
+    #task_checkActivities().run()
     #task_checkMaster().run()
     #basic_operate.get_line_num()
     #yys_ocrAuto(check_img.line_orc)
@@ -896,7 +896,7 @@ if __name__ == '__main__':
     #task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()
-    #task_train().run()
+    task_train("lv9").run()
     #task_information().run()
     #check_buildOrResearch().run()
     #task_checkDonata().run()