|
@@ -924,12 +924,14 @@ class task_paticipateInTeam(dongri_task):
|
|
|
|
|
|
class task_cure(dongri_task):
|
|
class task_cure(dongri_task):
|
|
def __init__(self, continueCure = False, cureNum = None):
|
|
def __init__(self, continueCure = False, cureNum = None):
|
|
|
|
+
|
|
cureStr = ""
|
|
cureStr = ""
|
|
if continueCure:
|
|
if continueCure:
|
|
- cureStr = "50次连续"
|
|
|
|
|
|
+ cureStr = f"连续"
|
|
super().__init__(f"{cureStr}治疗{cureNum}")
|
|
super().__init__(f"{cureStr}治疗{cureNum}")
|
|
self.continueCure = continueCure
|
|
self.continueCure = continueCure
|
|
self.cureNum = cureNum
|
|
self.cureNum = cureNum
|
|
|
|
+
|
|
def run(self):
|
|
def run(self):
|
|
basic_operate.go_town()
|
|
basic_operate.go_town()
|
|
basic_operate.go_outside()
|
|
basic_operate.go_outside()
|
|
@@ -955,7 +957,8 @@ class task_cure(dongri_task):
|
|
if waitClickImg_noWait_withBool(check_img.help4, 2, 1) == False:
|
|
if waitClickImg_noWait_withBool(check_img.help4, 2, 1) == False:
|
|
return False
|
|
return False
|
|
else:
|
|
else:
|
|
- maxTryTimes = 50 * 2
|
|
|
|
|
|
+ maxCureSoilder = 30000
|
|
|
|
+ maxTryTimes = int(maxCureSoilder) // int(self.cureNum) * 2
|
|
while waitClickImg_noWait_withBool((check_img.cure, check_img.help4, check_img.help5), 30, 0.2) and maxTryTimes >= 0:
|
|
while waitClickImg_noWait_withBool((check_img.cure, check_img.help4, check_img.help5), 30, 0.2) and maxTryTimes >= 0:
|
|
maxTryTimes -= 1
|
|
maxTryTimes -= 1
|
|
continue
|
|
continue
|
|
@@ -1123,7 +1126,7 @@ class task_fight_enemy(dongri_task):
|
|
if waitClickImg_noWait_withBool(special_activity_img.enemy, 2, 1) == False:
|
|
if waitClickImg_noWait_withBool(special_activity_img.enemy, 2, 1) == False:
|
|
return False
|
|
return False
|
|
|
|
|
|
- attackArr = [monster_img.attack, monster_img.attack2, monster_img.ranshuang_attack]
|
|
|
|
|
|
+ attackArr = [monster_img.attack, monster_img.attack2, monster_img.ranshuang_attack, monster_img.outside_attack]
|
|
|
|
|
|
myTimeSleep_big()
|
|
myTimeSleep_big()
|
|
firstPos = get_yys_random_point(special_activity_img.first_enemy_region)
|
|
firstPos = get_yys_random_point(special_activity_img.first_enemy_region)
|
|
@@ -1132,6 +1135,11 @@ class task_fight_enemy(dongri_task):
|
|
if waitFindImg_withBool(special_activity_img.visit_island, 1, 1) == True:
|
|
if waitFindImg_withBool(special_activity_img.visit_island, 1, 1) == True:
|
|
return False
|
|
return False
|
|
while waitFindImg_withBool(attackArr, 1, 0) == False and maxTryTimes > 0:
|
|
while waitFindImg_withBool(attackArr, 1, 0) == False and maxTryTimes > 0:
|
|
|
|
+ if waitClickImg_noWait_withBool(special_activity_img.outside_soilder, 1, 1) == True:
|
|
|
|
+ if waitFindImg_withBool(special_activity_img.outside_pcacc, 1, 1) == True:
|
|
|
|
+ break
|
|
|
|
+ else:
|
|
|
|
+ return False
|
|
maxTryTimes -= 1
|
|
maxTryTimes -= 1
|
|
myTimeSleep_big()
|
|
myTimeSleep_big()
|
|
mid_enemy_pos = get_yys_random_point(special_activity_img.mid_enemy_region)
|
|
mid_enemy_pos = get_yys_random_point(special_activity_img.mid_enemy_region)
|