!2 complete jina function

dongri_pic.py

@@ -135,9 +135,12 @@ class check_img:
     to_pcacc = R'dongri_img\check\to_pcacc.png'
     share_btn = R'dongri_img\check\share_btn.png'
     talk_in = R'dongri_img\check\talk_in.png'
+    talk_in2 = R'dongri_img\check\talk_in2.png'
     talkin_person = R'dongri_img\check\talkin_person.png'
     talkin_jina = R'dongri_img\check\talkin_jina.png'
     xiaohao_jina = R'dongri_img\check\xiaohao_jina.png'
+    jina_pic = R'dongri_img\check\jina_pic.png'
+    jina_pic2 = R'dongri_img\check\jina_pic2.png'
 
 
 class information_img:

dongri_task.py

@@ -286,17 +286,26 @@ class task_fight_jina_only(dongri_task):
             basic_operate.add_strength()
             basic_operate.go_outside()
         
-        if waitClickImg_noWait_withBool(check_img.talk_in, 2, 1) == False:
+        if waitClickImg_noWait_withBool((check_img.talk_in,check_img.talk_in2), 2, 1) == False:
             return False
         
         waitClickImg_noWait_withBool(check_img.talkin_person, 2, 1)
         
+        
         if waitClickImg_noWait_withBool(check_img.talkin_jina, 2, 1) == False:
             return False
         
+        myTimeSleep_big()
+        yys_dragAuto(check_img.move_down)
+        yys_dragAuto(check_img.move_down)
+        myTimeSleep_big()
+        
         if waitClickImg_noWait_withBool(check_img.xiaohao_jina, 2, 1) == False:
             return False
         
+        if waitClickImg_noWait_withBool((check_img.jina_pic, check_img.jina_pic2), 2, 1) == False:
+            return False
+        
         if waitClickImg_noWait_withBool(monster_img.muti_team, 2, 1) == False:
             return False
         waitClickImg_noWait_withBool(monster_img.begin_multi, 2, 1)
@@ -604,9 +613,13 @@ class task_checkStoreRoom(dongri_task):
             return False
         myTimeSleep_big()
         if waitFindImg_withBool(check_img.pet_findtreature, 2, 1) == False:
+            myTimeSleep_big()
             pcacc_mouse.quickclick_current()
+            myTimeSleep_big()
             waitClickImg_noWait_withBool((check_img.detail,check_img.detail2), 2, 1)
+            myTimeSleep_big()
             basic_operate.go_town()
+            myTimeSleep_big()
             if waitClickImg_noWait_withBool((check_img.storeroom, check_img.storeroom2, check_img.invite_free), 2, 1) == False:
                 return False
             myTimeSleep_big()
@@ -895,7 +908,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, special_activity_img.shili_860), 2, 1) == True:
+            if waitClickImg_noWait_withBool((special_activity_img.shili_120, special_activity_img.shili_860, special_activity_img.bigMonster), 2, 1) == True:
                 if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
                     return False
         
@@ -979,7 +992,7 @@ class task_checkActivities(dongri_task):
 
 
 if __name__ == '__main__':
-    task_call_jina().run()
+    task_fight_jina_only().run()
     #task_checkConfilits().run()
     #task_checkActivities().run()
     #task_checkMaster().run()