|
@@ -251,7 +251,7 @@ class task_fight_yongbing(dongri_task):
|
|
def run(self):
|
|
def run(self):
|
|
basic_operate.go_outside()
|
|
basic_operate.go_outside()
|
|
|
|
|
|
- if False == waitFindImg_withBool(monster_img.enough_strengh, 2, 1):
|
|
|
|
|
|
+ if False == waitFindImg_withBool(monster_img.enough_strengh2, 2, 1):
|
|
if self.add_strengh:
|
|
if self.add_strengh:
|
|
basic_operate.add_strength()
|
|
basic_operate.add_strength()
|
|
basic_operate.go_outside()
|
|
basic_operate.go_outside()
|
|
@@ -444,7 +444,7 @@ class task_fightMonster(dongri_task):
|
|
global g_task_lineCheck
|
|
global g_task_lineCheck
|
|
basic_operate.go_outside()
|
|
basic_operate.go_outside()
|
|
|
|
|
|
- if False == waitFindImg_withBool(monster_img.enough_strengh, 2, 1):
|
|
|
|
|
|
+ if False == waitFindImg_withBool(monster_img.enough_strengh2, 2, 1):
|
|
if self.add_strengh:
|
|
if self.add_strengh:
|
|
basic_operate.add_strength()
|
|
basic_operate.add_strength()
|
|
basic_operate.go_outside()
|
|
basic_operate.go_outside()
|
|
@@ -1126,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, monster_img.outside_attack]
|
|
|
|
|
|
+ attackArr = [monster_img.attack, monster_img.attack2, monster_img.ranshuang_attack, monster_img.outside_attack, monster_img.defend]
|
|
|
|
|
|
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)
|
|
@@ -1270,7 +1270,7 @@ if __name__ == '__main__':
|
|
#task_fight_yongbing(True).run()
|
|
#task_fight_yongbing(True).run()
|
|
#task_collect([4,3,2,1]).run()
|
|
#task_collect([4,3,2,1]).run()
|
|
#task_train("upgrade").run()
|
|
#task_train("upgrade").run()
|
|
- #task_information().run()
|
|
|
|
|
|
+ task_information(True).run()
|
|
#check_buildOrResearch().run()
|
|
#check_buildOrResearch().run()
|
|
#task_checkDonata().run()
|
|
#task_checkDonata().run()
|
|
#task_collect(1).run()
|
|
#task_collect(1).run()
|
|
@@ -1283,4 +1283,4 @@ if __name__ == '__main__':
|
|
#task_get_redPackage().run()
|
|
#task_get_redPackage().run()
|
|
#task_read_mails().run()
|
|
#task_read_mails().run()
|
|
#task_checkBenifitStatus().run()
|
|
#task_checkBenifitStatus().run()
|
|
- task_checkDiamond().run()
|
|
|
|
|
|
+ #task_checkDiamond().run()
|