|
@@ -89,7 +89,7 @@ class basic_operate:
|
|
|
tryMaxTimes = 5
|
|
|
while tryMaxTimes > 0:
|
|
|
tryMaxTimes -= 1
|
|
|
- if waitFindImg_withBool(place_img.gameIn, 1, preTime) == False:
|
|
|
+ if waitFindImg_withBool((place_img.gameIn, place_img.gameIn2), 1, preTime) == False:
|
|
|
basic_operate.do_back()
|
|
|
else:
|
|
|
return True
|
|
@@ -1046,14 +1046,13 @@ class task_fight_ranshuang(dongri_task):
|
|
|
super().__init__(f"打燃霜")
|
|
|
def run(self):
|
|
|
basic_operate.backToGame()
|
|
|
+ maxTime = 4
|
|
|
+ while waitClickImg_noWait_withBool((monster_img.ranshuang_attack, monster_img.ranshuang_search), 1, 1) and maxTime > 0:
|
|
|
+ maxTime -= 1
|
|
|
+ continue
|
|
|
|
|
|
- if False == basic_operate.click_outside_search():#change to click ranshuang
|
|
|
- return False
|
|
|
-
|
|
|
- if waitClickImg_noWait_withBool(monster_img.attack, 2, 1) == False:
|
|
|
- return False
|
|
|
|
|
|
- if waitClickImg_withBool([monster_img.fight, monster_img.fight2], 1, 1) == False:
|
|
|
+ if waitClickImg_noWait_withBool([monster_img.fight, monster_img.fight2], 1, 1) == False:
|
|
|
return False
|
|
|
return True
|
|
|
|
|
@@ -1064,6 +1063,7 @@ class task_fight_ranshuang(dongri_task):
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
+ task_fight_ranshuang().run()
|
|
|
#task_gotoTree().run()
|
|
|
#task_fight_jina_only().run()
|
|
|
#task_checkConfilits().run()
|
|
@@ -1073,7 +1073,7 @@ if __name__ == '__main__':
|
|
|
#yys_ocrAuto(check_img.line_orc)
|
|
|
#basic_operate.go_town()
|
|
|
#basic_operate.add_strength()
|
|
|
- task_fightMonster(False, False,False).run()
|
|
|
+ #task_fightMonster(False, False,False).run()
|
|
|
#task_checkHelp().run()
|
|
|
#task_checkStoreRoom().run()
|
|
|
#task_activity_lianmeng().run()
|