|
@@ -84,7 +84,7 @@ class basic_operate:
|
|
|
if ret:
|
|
|
pcacc_mouse.click(pos[0] + 20, pos[1] + 80)
|
|
|
|
|
|
-
|
|
|
+ @staticmethod
|
|
|
def backToGame(preTime = 0):
|
|
|
tryMaxTimes = 5
|
|
|
while tryMaxTimes > 0:
|
|
@@ -100,7 +100,7 @@ class basic_operate:
|
|
|
if basic_operate.backToGame(preTime) == False:
|
|
|
return False
|
|
|
|
|
|
- waitClickImg_noWait_withBool(place_img.outside, 0.6, 0)
|
|
|
+ waitClickImg_noWait_withBool(place_img.outside, 0.6, 0.5)
|
|
|
return True
|
|
|
|
|
|
@staticmethod
|
|
@@ -108,7 +108,7 @@ class basic_operate:
|
|
|
if basic_operate.backToGame(preTime) == False:
|
|
|
return False
|
|
|
|
|
|
- waitClickImg_noWait_withBool(place_img.town, 0.6, 0)
|
|
|
+ waitClickImg_noWait_withBool(place_img.town, 0.6, 0.5)
|
|
|
return True
|
|
|
|
|
|
@staticmethod
|
|
@@ -443,12 +443,14 @@ class task_fightMonster(dongri_task):
|
|
|
else:
|
|
|
print("没有足够的体力了")
|
|
|
return False
|
|
|
+
|
|
|
+ if self.add_strengh and basic_operate.get_line_num() >= 6:
|
|
|
+ return False
|
|
|
|
|
|
if False == basic_operate.click_outside_search():
|
|
|
return False
|
|
|
|
|
|
- if self.add_strengh and basic_operate.get_line_num() >= 6:
|
|
|
- return False
|
|
|
+
|
|
|
|
|
|
|
|
|
if waitFindImg_withBool(monster_img.search, 2, 1):
|
|
@@ -1038,6 +1040,24 @@ class task_visit_island(dongri_task):
|
|
|
if waitClickImg_noWait_withBool(check_img.visit_island_big, 2, 1) == False:
|
|
|
return False
|
|
|
return True
|
|
|
+
|
|
|
+class task_fight_ranshuang(dongri_task):
|
|
|
+ def __init__(self):
|
|
|
+ super().__init__(f"打燃霜")
|
|
|
+ def run(self):
|
|
|
+ basic_operate.backToGame()
|
|
|
+
|
|
|
+ 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:
|
|
|
+ return False
|
|
|
+ return True
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -1053,11 +1073,11 @@ 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()
|
|
|
- task_fight_yongbing(True).run()
|
|
|
+ #task_fight_yongbing(True).run()
|
|
|
#task_collect([4,3,2,1]).run()
|
|
|
#task_train("lv9").run()
|
|
|
#task_information().run()
|