Przeglądaj źródła

!2 fix close game and lianmeng find

pcacc 2 miesięcy temu
rodzic
commit
9b96157ac3
3 zmienionych plików z 19 dodań i 6 usunięć
  1. 1 0
      app_dongri.py
  2. 1 0
      dongri_pic.py
  3. 17 6
      dongri_task.py

+ 1 - 0
app_dongri.py

@@ -187,6 +187,7 @@ def handle_close_game():
 def http_close_game():
     print("HTTP 触发 close_game")
     handle_close_game()
+    socketio.start_background_task(handle_end_script)
     return jsonify({"status": "success", "message": "已关闭"})
 
 

+ 1 - 0
dongri_pic.py

@@ -264,6 +264,7 @@ class special_activity_img:
     shili_430  = R'dongri_img\special_activity\shili_430.png'
     
     move_left = (163, 127, 469, 112)
+    move_right_little = (469, 112, 372, 126)
     move_down = (234,624,237,488)
 
     bigMonster = R'dongri_img\special_activity\bigMonster.png'

+ 17 - 6
dongri_task.py

@@ -1113,13 +1113,24 @@ class task_activity_lianmeng(dongri_task):
         myTimeSleep_big()
         if waitClickImg_noWait_withBool(special_activity_img.normal, 1, 0.5) == False:
             return False
-        if waitClickImg_noWait_withBool((special_activity_img.lianmeng,special_activity_img.lianmeng2,special_activity_img.lianmeng3), 1, 0.5) == False:
+        lianmeng_arr = [special_activity_img.lianmeng, special_activity_img.lianmeng2, special_activity_img.lianmeng3]
+        while waitClickImg_noWait_withBool(lianmeng_arr, 1, 0.5) == False:
             yys_dragAuto(special_activity_img.move_left)
             myTimeSleep_small()
+            if waitClickImg_noWait_withBool(lianmeng_arr, 1, 0.5) == True:
+                break
             yys_dragAuto(special_activity_img.move_left)
             myTimeSleep_small()
-            if waitClickImg_noWait_withBool((special_activity_img.lianmeng,special_activity_img.lianmeng2, special_activity_img.lianmeng3), 1, 0.5) == False:
-                return False
+            if waitClickImg_noWait_withBool(lianmeng_arr, 1, 0.5) == True:
+                break
+            yys_dragAuto(special_activity_img.move_right_little)
+            myTimeSleep_small()
+            if waitClickImg_noWait_withBool(lianmeng_arr, 1, 0.5) == True:
+                break
+            return False
+
+        
+
         
         waitClickImg_noWait_withBool(special_activity_img.task_done, 1, 0.5)
         
@@ -1501,8 +1512,8 @@ class task_duanwu(dongri_task):
 
 
 if __name__ == '__main__':
-    print(get_todo_time("巨熊行动"))
-    task_check_Research().run()
+    #print(get_todo_time("巨熊行动"))
+    #task_check_Research().run()
     #save_game_screen()
     #basic_operate.get_line_num()
     #task_cure(True, 85).run()
@@ -1524,7 +1535,7 @@ if __name__ == '__main__':
     #task_start_game(0)
     #check_safe_collect().run()
     #task_fight_campion().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()