|
@@ -691,8 +691,8 @@ class task_gotoTree(dongri_task):
|
|
myTimeSleep_big()
|
|
myTimeSleep_big()
|
|
pcacc_mouse.quickclick_current()
|
|
pcacc_mouse.quickclick_current()
|
|
myTimeSleep_big()
|
|
myTimeSleep_big()
|
|
- waitClickImg_noWait_withBool(check_img.life_jam, 2, 1)
|
|
|
|
- waitClickImg_noWait_withBool(check_img.life_jam, 2, 1)
|
|
|
|
|
|
+ waitClickImg_noWait_withBool((check_img.life_jam, check_img.life_jam2), 2, 1)
|
|
|
|
+ waitClickImg_noWait_withBool((check_img.life_jam, check_img.life_jam2), 2, 1)
|
|
return True
|
|
return True
|
|
|
|
|
|
class task_getStrength(dongri_task):
|
|
class task_getStrength(dongri_task):
|
|
@@ -733,7 +733,7 @@ class task_checkStoreRoom(dongri_task):
|
|
myTimeSleep_big()
|
|
myTimeSleep_big()
|
|
|
|
|
|
if waitFindImg_withBool(check_img.pet_findtreature, 2, 1) == False:# storeroom
|
|
if waitFindImg_withBool(check_img.pet_findtreature, 2, 1) == False:# storeroom
|
|
- waitClickImg_noWait_withBool(check_img.bigGet, 2, 1)
|
|
|
|
|
|
+ waitClickImg_noWait_withBool((check_img.bigGet, check_img.chenxi_get2), 2, 1)
|
|
pcacc_mouse.quickclick_current()
|
|
pcacc_mouse.quickclick_current()
|
|
myTimeSleep_big()
|
|
myTimeSleep_big()
|
|
if waitClickImg_noWait_withBool((check_img.detail,check_img.detail2), 2, 1):
|
|
if waitClickImg_noWait_withBool((check_img.detail,check_img.detail2), 2, 1):
|