|
|
@@ -1105,33 +1105,31 @@ class task_paticipateInTeam(dongri_task):
|
|
|
myTimeSleep_big()
|
|
|
dragTimes = 5
|
|
|
for i in range(dragTimes):
|
|
|
- yys_dragAuto(check_img.move_down, True)
|
|
|
+ yys_dragAuto(check_img.move_down_big, True)
|
|
|
myTimeSleep(0.02)
|
|
|
|
|
|
+ myTimeSleep_small()
|
|
|
ret = False
|
|
|
for i in range(dragTimes*2):
|
|
|
ret = waitClickImg_noWait_withBool(monster_img.participate, 1, 0, True)
|
|
|
if ret == True:
|
|
|
break
|
|
|
else:
|
|
|
- yys_dragAuto(check_img.move_down, True)
|
|
|
+ yys_dragAuto(check_img.move_down_big, True)
|
|
|
myTimeSleep_small()
|
|
|
if ret == False:
|
|
|
return False
|
|
|
|
|
|
waitClickImg_noWait_withBool(self.line, 0.1, 1)
|
|
|
|
|
|
- if waitFindImg_withBool(special_activity_img.power0, 0.1, 0) == False:# 实力不为0
|
|
|
- if self.checkPower:
|
|
|
- if waitFindImg_withBool(check_img.enough_soilder, 1, 0) == False:
|
|
|
- return False
|
|
|
-
|
|
|
- waitClickImg_withBool([monster_img.fight, monster_img.fight2, monster_img.fight3], 1, 0)
|
|
|
- if waitFindImg_withBool(check_img.auto_confilit, 2, 0) == False:
|
|
|
- return False
|
|
|
- else:
|
|
|
- yys_dragAuto(check_img.move_down_big)
|
|
|
- myTimeSleep_small()
|
|
|
+ if waitFindImg_withBool(special_activity_img.power0, 0.1, 0) == False:# 实力不为0
|
|
|
+ if self.checkPower:
|
|
|
+ if waitFindImg_withBool(check_img.enough_soilder, 1, 0) == False:
|
|
|
+ return False
|
|
|
+
|
|
|
+ waitClickImg_withBool([monster_img.fight, monster_img.fight2, monster_img.fight3], 1, 0)
|
|
|
+ if waitFindImg_withBool(check_img.auto_confilit, 2, 0) == False:
|
|
|
+ return False
|
|
|
|
|
|
|
|
|
return True
|
