Merge branch 'master' of http://192.168.50.108:37829/pcacc/yys_auto

app_dongri.py

@@ -347,9 +347,8 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_cure(True, g_cureNum))
             return
         
-        if g_switch == False:
-            task_queue.appendleft(task_checkActivities())
-        else:
+        task_queue.appendleft(task_checkActivities())
+        if g_switch == True:
             task_queue.appendleft(task_checkBenifitStatus())
         
         # first run

dongri_task.py

@@ -1039,12 +1039,14 @@ class task_paticipateInTeam(dongri_task):
         yys_dragAuto(check_img.move_down)
         myTimeSleep_small()
         yys_dragAuto(check_img.move_down)
-        myTimeSleep_big()
-        if waitClickImg_noWait_withBool(monster_img.participate, 1, 1, True) == False:
-            yys_dragAuto(check_img.move_down)
-            myTimeSleep_big()
-            if waitClickImg_noWait_withBool(monster_img.participate, 1, 1, True) == False:
-                return False
+        myTimeSleep_small()
+        yys_dragAuto(check_img.move_down)
+        myTimeSleep_small()
+        set_isDown(True)
+        ret = waitClickImg_noWait_withBool(monster_img.participate, 1, 1, True)
+        set_isDown(False)
+        if ret == False:
+            return False
         
         waitClickImg_noWait_withBool(self.line, 0.1, 1)
         maxTryTimes = 3