|
@@ -602,16 +602,14 @@ class task_collect(dongri_task):
|
|
if self.line != None:
|
|
if self.line != None:
|
|
waitClickImg_noWait_withBool(self.line, 2, 1)
|
|
waitClickImg_noWait_withBool(self.line, 2, 1)
|
|
|
|
|
|
- if waitClickImg_noWait_withBool(monster_img.all_select, 2, 1) == False:
|
|
|
|
- return False
|
|
|
|
- waitClickImg_noWait_withBool(monster_img.all_select, 2, 1)
|
|
|
|
|
|
+ waitClickImg_noWait_withBool(monster_img.average_select, 2, 1)
|
|
|
|
|
|
maxTryTimes = 3
|
|
maxTryTimes = 3
|
|
while maxTryTimes > 0:
|
|
while maxTryTimes > 0:
|
|
maxTryTimes -= 1
|
|
maxTryTimes -= 1
|
|
waitClickImg_withBool([monster_img.fight, monster_img.fight2], 1, 1)
|
|
waitClickImg_withBool([monster_img.fight, monster_img.fight2], 1, 1)
|
|
- waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
|
|
|
|
- if waitFindImg_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
|
|
|
+ waitClickImg_noWait_withBool(monster_img.average_select, 1, 1)
|
|
|
|
+ if waitFindImg_withBool(monster_img.average_select, 1, 1) == False:
|
|
break
|
|
break
|
|
return True
|
|
return True
|
|
|
|
|