|
@@ -256,7 +256,7 @@ class task_fight_yongbing(dongri_task):
|
|
|
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)
|
|
waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
|
|
|
- if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
|
|
|
|
+ if waitFindImg_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
break
|
|
break
|
|
|
|
|
|
|
|
return True
|
|
return True
|
|
@@ -310,7 +310,7 @@ class task_fight_jina(dongri_task):
|
|
|
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)
|
|
waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
|
|
|
- if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
|
|
|
|
+ if waitFindImg_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
break
|
|
break
|
|
|
|
|
|
|
|
return True
|
|
return True
|
|
@@ -370,7 +370,7 @@ class task_fightMonster(dongri_task):
|
|
|
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)
|
|
waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
|
|
|
- if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
|
|
|
|
+ if waitFindImg_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
break
|
|
break
|
|
|
|
|
|
|
|
return True
|
|
return True
|
|
@@ -443,7 +443,7 @@ class task_collect(dongri_task):
|
|
|
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)
|
|
waitClickImg_noWait_withBool(monster_img.all_select, 1, 1)
|
|
|
- if waitClickImg_noWait_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
|
|
|
|
+ if waitFindImg_withBool(monster_img.all_select, 1, 1) == False:
|
|
|
break
|
|
break
|
|
|
return True
|
|
return True
|
|
|
|
|
|
