Kaynağa Gözat

!2 add shili detect

pcacc 3 ay önce
ebeveyn
işleme
8afc77e0fe
2 değiştirilmiş dosya ile 24 ekleme ve 9 silme
  1. 1 0
      dongri_pic.py
  2. 23 9
      dongri_task.py

+ 1 - 0
dongri_pic.py

@@ -224,6 +224,7 @@ class special_activity_img:
     shili_860_2 = R'dongri_img\special_activity\shili_860_2.png'
     shili_860_3 = R'dongri_img\special_activity\shili_860_3.png'
     move_left = (163, 127, 469, 112)
+    move_down = (234,624,237,488)
 
     bigMonster = R'dongri_img\special_activity\bigMonster.png'
     owning = R'dongri_img\special_activity\owning.png'

+ 23 - 9
dongri_task.py

@@ -996,14 +996,27 @@ class task_activity_lianmeng(dongri_task):
             if waitClickImg_noWait_withBool((special_activity_img.lianmeng,special_activity_img.lianmeng2), 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_120, special_activity_img.shili_860_2, special_activity_img.bigMonster), 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, 1, 0.5)
+        
+        if waitFindImg_withBool(special_activity_img.doing_task, 1, 0.5) == False:
+            down_tryTimes = 3
+            while down_tryTimes > 0:
+                down_tryTimes -= 1
+                if waitClickImg_noWait_withBool((special_activity_img.shili_120, special_activity_img.shili_860_2), 1, 0.5, True) == True:
+                    if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
+                        return False
+                    break
+                yys_dragAuto(special_activity_img.move_down)
         
-        if waitFindImg_withBool((special_activity_img.shili_120, special_activity_img.shili_860_2), 2, 1) == False:
+        up_tryTimes = 5
+        while up_tryTimes > 0:
+            up_tryTimes -= 1
+            myTimeSleep_small()
+            yys_dragAuto(change_direction(special_activity_img.move_down))
+                
+
+
+        if waitFindImg_withBool((special_activity_img.shili_120, special_activity_img.shili_860_2), 2, 0.5, True) == False:
             maxTryTimes = 2
             while waitClickImg_noWait_withBool((special_activity_img.owning), 2, 1) == True:
                 waitClickImg_noWait_withBool(special_activity_img.refresh_task, 2, 1)
@@ -1253,6 +1266,7 @@ class task_checkDiamond(dongri_task):
 
 
 if __name__ == '__main__':
+    #basic_operate.get_line_num()
     #task_cure(True, 85).run()
     #task_fight_enemy().run()
     #task_fight_ranshuang().run()
@@ -1268,11 +1282,11 @@ if __name__ == '__main__':
     #task_fightMonster(False, False,False).run()
     #task_checkHelp().run()
     #task_checkStoreRoom().run()
-    #task_activity_lianmeng().run()
+    task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()
     #task_train("upgrade").run()
-    task_information(True).run()
+    #task_information(True).run()
     #check_buildOrResearch().run()
     #task_checkDonata().run()
     #task_collect(1).run()