|
@@ -446,10 +446,10 @@ class task_fightMonster(dongri_task):
|
|
self.attack = monster_img.attack
|
|
self.attack = monster_img.attack
|
|
|
|
|
|
def run(self):
|
|
def run(self):
|
|
- global g_task_lineCheck
|
|
|
|
|
|
+ global g_task_lineCheck
|
|
basic_operate.go_outside()
|
|
basic_operate.go_outside()
|
|
|
|
|
|
- if False == waitFindImg_withBool(monster_img.enough_strengh2, 2, 1):
|
|
|
|
|
|
+ if False == waitFindImg_withBool((monster_img.enough_strengh2, monster_img.enough_strengh3), 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()
|
|
@@ -824,7 +824,7 @@ class task_information(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_strengh, monster_img.enough_strengh3), 2, 1):
|
|
if self.isAddStrengh:
|
|
if self.isAddStrengh:
|
|
basic_operate.add_strength()
|
|
basic_operate.add_strength()
|
|
basic_operate.go_outside()
|
|
basic_operate.go_outside()
|
|
@@ -1358,11 +1358,11 @@ if __name__ == '__main__':
|
|
#yys_ocrAuto(check_img.line_orc)
|
|
#yys_ocrAuto(check_img.line_orc)
|
|
#basic_operate.go_town()
|
|
#basic_operate.go_town()
|
|
#basic_operate.add_strength()
|
|
#basic_operate.add_strength()
|
|
- #task_fightMonster(False, False,False).run()
|
|
|
|
|
|
+ task_fightMonster(False, False,False).run()
|
|
#task_checkHelp().run()
|
|
#task_checkHelp().run()
|
|
#task_checkStoreRoom().run()
|
|
#task_checkStoreRoom().run()
|
|
#task_start_game(0)
|
|
#task_start_game(0)
|
|
- check_safe_collect().run()
|
|
|
|
|
|
+ #check_safe_collect().run()
|
|
#task_fight_campion().run()
|
|
#task_fight_campion().run()
|
|
#task_activity_lianmeng().run()
|
|
#task_activity_lianmeng().run()
|
|
#task_fight_yongbing(True).run()
|
|
#task_fight_yongbing(True).run()
|