!2 add functiong auto accept lianmeng task

app_dongri.py

@@ -179,14 +179,17 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
     print("collectArr", collectArr)
     times = 0
     while not event.is_set():
-
+        
+        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_useAnnimalSkill())
+        
         task_queue.appendleft(task_checkDonata())
         task_queue.appendleft(task_checkStoreRoom())
         if not isSimple:
@@ -200,8 +203,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))
-        if activity == 'lianmeng':
-            task_queue.appendleft(task_activity_lianmeng())
         task_queue.appendleft(task_collect(collectArr, isSimple))
         task_queue.appendleft(task_train(False))
         task_queue.appendleft(task_collect(collectArr, isSimple))

dongri_pic.py

@@ -104,6 +104,7 @@ class check_img:
     annimal_skill = R'dongri_img\check\anninal_skill.png'
     wolf_skill = R'dongri_img\check\wolf_skill.png'
     use = R'dongri_img\check\use.png'
+    use2 = R'dongri_img\check\use2.png'
     pack = R'dongri_img\check\pack.png'
     other = R'dongri_img\check\other.png'
     other2 = R'dongri_img\check\other2.png'
@@ -136,10 +137,16 @@ class special_activity_img:
     # = R'dongri_img\special_activity\.png'
     normal = R'dongri_img\special_activity\normal.png'
     lianmeng = R'dongri_img\special_activity\lianmeng.png'
+    lianmeng2 = R'dongri_img\special_activity\lianmeng2.png'
     shili = R'dongri_img\special_activity\shili.png'
+    shili2 = R'dongri_img\special_activity\shili2.png'
     owning = R'dongri_img\special_activity\owning.png'
     refresh_task = R'dongri_img\special_activity\refresh_task.png'
     accept_task = R'dongri_img\special_activity\accept_task.png'
     refresh = R'dongri_img\special_activity\refresh.png'
+    doing_task = R'dongri_img\special_activity\doing_task.png'
+    task_done = R'dongri_img\special_activity\task_done.png'
+
+
 
 _imported = False

dongri_task.py

@@ -711,7 +711,7 @@ class task_useAnnimalSkill(dongri_task):
         if waitClickImg_noWait_withBool(check_img.wolf_skill, 2, 1) == False:
             return False
         
-        if waitClickImg_noWait_withBool(check_img.use, 2, 1) == False:
+        if waitClickImg_noWait_withBool((check_img.use, check_img.use2), 2, 1) == False:
             return False
 
 class task_activity_lianmeng(dongri_task):
@@ -721,11 +721,16 @@ class task_activity_lianmeng(dongri_task):
         basic_operate.go_town()
         if waitClickImg_noWait_withBool(special_activity_img.normal, 2, 1) == False:
             return False
-        if waitClickImg_noWait_withBool(special_activity_img.lianmeng, 2, 1) == False:
+        if waitClickImg_noWait_withBool((special_activity_img.lianmeng,special_activity_img.lianmeng2), 2, 1) == False:
             return False
-        if waitClickImg_noWait_withBool(special_activity_img.shili, 2, 1) == True:
-            if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
-                return False
+        
+        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, 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:
             maxTryTimes -= 1