pcacc пре 3 месеци
родитељ
комит
ba9671e3de

+ 2 - 5
app_dongri.py

@@ -320,12 +320,12 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_cure(True, g_cureNum))
             task_queue.appendleft(task_cure(True, g_cureNum))
             return
-        
         # first run
         if g_times % 3 == 1:
             task_queue.appendleft(check_safe_collect())
             if get_rungame_type() == 0:
                 task_queue.appendleft(task_checkActivities())
+            
         if isSimple == False:
             task_queue.appendleft(task_information())
 
@@ -455,10 +455,7 @@ def get_rungame_type():
     if runTypeStr not in config:
         return 0
     else:
-        if config[runTypeStr] == 1:
-            return 0
-        else:
-            return 1
+        return config[runTypeStr]
 
 # 修改或添加 "login_task" 的值
 def set_login_task(config, value):

BIN
dongri_img/special_activity/doing_task.png


BIN
dongri_img/special_activity/lianmeng3.png


+ 1 - 0
dongri_pic.py

@@ -226,6 +226,7 @@ class special_activity_img:
     normal = R'dongri_img\special_activity\normal.png'
     lianmeng = R'dongri_img\special_activity\lianmeng.png'
     lianmeng2 = R'dongri_img\special_activity\lianmeng2.png'
+    lianmeng3 = R'dongri_img\special_activity\lianmeng3.png'
     shili = R'dongri_img\special_activity\shili.png'
     shili_2 = R'dongri_img\special_activity\shili_2.png'
     shili2 = R'dongri_img\special_activity\shili2.png'

+ 3 - 3
dongri_task.py

@@ -1021,12 +1021,12 @@ 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), 1, 0.5) == False:
+        if waitClickImg_noWait_withBool((special_activity_img.lianmeng,special_activity_img.lianmeng2,special_activity_img.lianmeng3), 1, 0.5) == False:
             yys_dragAuto(special_activity_img.move_left)
             myTimeSleep_small()
             yys_dragAuto(special_activity_img.move_left)
             myTimeSleep_small()
-            if waitClickImg_noWait_withBool((special_activity_img.lianmeng,special_activity_img.lianmeng2), 1, 0.5) == False:
+            if waitClickImg_noWait_withBool((special_activity_img.lianmeng,special_activity_img.lianmeng2, special_activity_img.lianmeng3), 1, 0.5) == False:
                 return False
         
         waitClickImg_noWait_withBool(special_activity_img.task_done, 1, 0.5)
@@ -1035,7 +1035,7 @@ class task_activity_lianmeng(dongri_task):
             down_tryTimes = 3
             while down_tryTimes > 0:
                 down_tryTimes -= 1
-                if waitClickImg_noWait_withBool((special_activity_img.shili_120_2, special_activity_img.shili_860_2, special_activity_img.shili_430, special_activity_img.bigMonster_2), 1, 0.5, True) == True:
+                if waitClickImg_noWait_withBool((special_activity_img.shili_120_2, special_activity_img.shili_860_2, special_activity_img.shili_430), 1, 0.5, True) == True:
                     if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
                         return False
                     break