!2 more time get red package

app_dongri.py

@@ -406,15 +406,23 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 handle_end_game()
             if g_switch == False:
                 if always:
-                    myTimeSleep(random.randint(400, 450), send_status)
+                    nextTaskTime = random.randint(400, 450)
+                    set_nextTaskTime(nextTaskTime)
+                    myTimeSleep(nextTaskTime, send_status)
                 else:
-                    myTimeSleep(random.randint(1000, 2000), send_status)
+                    nextTaskTime = random.randint(1000, 2000)
+                    set_nextTaskTime(nextTaskTime)
+                    myTimeSleep(nextTaskTime, send_status)
             else:
-                myTimeSleep(random.randint(20, 50), send_status)
+                nextTaskTime = random.randint(20, 50)
+                set_nextTaskTime(nextTaskTime)
+                myTimeSleep(nextTaskTime, send_status)
             if g_isRestart:
                 handle_restart_game()
         else:
-            myTimeSleep(random.randint(400, 450), send_status)
+            nextTaskTime = random.randint(400, 450)
+            set_nextTaskTime(nextTaskTime)
+            myTimeSleep(nextTaskTime, send_status)
             
         
     task_queue.clear()

dongri_task.py

@@ -35,6 +35,18 @@ import datetime as dt
 todo_msg = ''
 todo_list = []
 g_task_lineCheck = False
+g_nextTaskTime = time.time()
+
+def set_nextTaskTime(val):
+    global g_nextTaskTime
+    g_nextTaskTime = val + time.time()
+
+def get_nextTaskTime():
+    global g_nextTaskTime
+    ret = g_nextTaskTime - time.time()
+    if ret < 0:
+        return 0
+    return ret
 
 def set_lineCheck(val):
     global g_task_lineCheck
@@ -1389,7 +1401,11 @@ class task_get_redPackage(dongri_task):
             return False
         waitClickImg_noWait_withBool(check_img.talkin_world, 2, 1)
         oldTime = time.time()
-        max_waitTime = 150
+        max_waitTime = get_nextTaskTime()
+        print(f"max_waitTime:{max_waitTime}")
+        if max_waitTime == 0:
+            max_waitTime = 150
+
         red_package_pics = [special_activity_img.red_package, special_activity_img.red_package2, special_activity_img.red_package3, special_activity_img.msg_new, special_activity_img.red_package_open]
         runTimes = 0
         while True:

scriptBase/comon.py

@@ -66,7 +66,7 @@ def waitFindImg(imgPath, waitTime, preWaitTime, isCV=False):
             myTimeSleep(0.1)
             curTime = time.time() - pre
     costTime = time.time() - pre
-    print(f"waitFindImg failed, cost:{costTime}, img:{imgPath}")
+    print(f"waitFindImg failed, cost:{costTime:.2f}, img:{imgPath}")
     return False, None
 
 
@@ -86,7 +86,7 @@ def waitClickImg_noWait(imgPath, waitTime, preWaitTime, isCV=False):
             myTimeSleep(0.1)
             curTime = time.time() - pre
     costTime = time.time() - pre
-    print(f"waitClickImg_noWait failed, cost:{costTime}, img:{imgPath}")
+    print(f"waitClickImg_noWait failed, cost:{costTime:.2f}, img:{imgPath}")
     return False, (-1, -1)
 
 def waitFindImg_withBool(imgPath, waitTime, preWaitTime, isCV=False):