mirror of
https://github.com/ok-oldking/ok-wuthering-waves.git
synced 2025-04-24 08:25:16 +00:00
A
1111
This commit is contained in:
parent
9747d43d9f
commit
fe4bf677ad
1
.gitignore
vendored
1
.gitignore
vendored
@ -61,3 +61,4 @@ pip-log.txt
|
|||||||
pip-delete-this-directory.txt
|
pip-delete-this-directory.txt
|
||||||
autohelper
|
autohelper
|
||||||
working_images/
|
working_images/
|
||||||
|
repo/
|
@ -352,7 +352,7 @@ class BaseWWTask(BaseTask):
|
|||||||
return 'en_US'
|
return 'en_US'
|
||||||
return 'unknown_lang'
|
return 'unknown_lang'
|
||||||
|
|
||||||
def teleport_to_boss(self, boss_name, use_custom=False):
|
def teleport_to_boss(self, boss_name, use_custom=False, dead=False):
|
||||||
self.zoom_map()
|
self.zoom_map()
|
||||||
pos = self.bosses_pos.get(boss_name)
|
pos = self.bosses_pos.get(boss_name)
|
||||||
page = pos[0]
|
page = pos[0]
|
||||||
@ -397,7 +397,13 @@ class BaseWWTask(BaseTask):
|
|||||||
self.log_info(f'index after scrolling down {index}')
|
self.log_info(f'index after scrolling down {index}')
|
||||||
self.click_relative(0.89, 0.91)
|
self.click_relative(0.89, 0.91)
|
||||||
self.sleep(1)
|
self.sleep(1)
|
||||||
self.wait_click_travel(use_custom=use_custom)
|
# 判断是否是角色死亡,需要传送复活状态
|
||||||
|
if not dead:
|
||||||
|
self.wait_click_travel(use_custom=use_custom)
|
||||||
|
else:
|
||||||
|
self.click_relative(0.92, 0.91)
|
||||||
|
self.sleep(1)
|
||||||
|
self.click_relative(0.68, 0.6)
|
||||||
self.wait_in_team_and_world(time_out=120)
|
self.wait_in_team_and_world(time_out=120)
|
||||||
self.sleep(0.5)
|
self.sleep(0.5)
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ class FarmWorldBossTask(BaseCombatTask):
|
|||||||
logger.info(f'sleep for the Bell-Borne model to appear')
|
logger.info(f'sleep for the Bell-Borne model to appear')
|
||||||
self.sleep(15)
|
self.sleep(15)
|
||||||
elif boss_name == 'Lorelei':
|
elif boss_name == 'Lorelei':
|
||||||
if count % 6 < 3:
|
if count % 6 < 3:
|
||||||
self.change_time_to_night()
|
self.change_time_to_night()
|
||||||
self.middle_click_relative(0.5, 0.5)
|
self.middle_click_relative(0.5, 0.5)
|
||||||
self.sleep(0.4)
|
self.sleep(0.4)
|
||||||
@ -92,8 +92,12 @@ class FarmWorldBossTask(BaseCombatTask):
|
|||||||
try:
|
try:
|
||||||
self.combat_once(wait_before=0)
|
self.combat_once(wait_before=0)
|
||||||
except CharDeadException as e:
|
except CharDeadException as e:
|
||||||
self.log_error(f'Characters dead', notify=True, tray=True)
|
# self.log_error(f'Characters dead', notify=True, tray=True)
|
||||||
return
|
# 打开书,选择一个没有传送点的Boss(老朔雷),传送到附近坐标复活角色,再从下一个boss继续
|
||||||
|
self.sleep(1)
|
||||||
|
self.send_key('esc')
|
||||||
|
self.teleport_to_boss('Tempest Mephis', use_custom=True, dead=True)
|
||||||
|
continue
|
||||||
logger.info(f'farm echo combat end')
|
logger.info(f'farm echo combat end')
|
||||||
if boss_name == 'Bell-Borne Geochelone':
|
if boss_name == 'Bell-Borne Geochelone':
|
||||||
logger.info(f'sleep for the Boss model to disappear')
|
logger.info(f'sleep for the Boss model to disappear')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user