mirrors/ok-wuthering-waves
0
0
Fork 0
mirror of https://github.com/ok-oldking/ok-wuthering-waves.git synced 2025-06-05 08:25:28 +00:00
Code

修复无冠者可能卡住, 修复可能esc跳出

Browse Source
This commit is contained in:
firedcto@gmail.com 2024-07-25 01:26:04 +08:00
parent b3631764ad
commit b2bcf9dd19
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/task/BaseCombatTask.py
View File

@ -222,6 +222,8 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck):
else:
logger.warning(f"can't find the f to enter")
return False
if target_text:
return f_found
remaining = time.time() - start
if self.handle_claim_button():
@ -255,6 +257,8 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck):
target_text=target_text) and self.sleep(0.5)
else:
self.send_key('f')
if target_text:
return True
if self.handle_claim_button():
return False
self.sleep(0.5)

3
src/task/FarmWorldBossTask.py
View File

@ -165,6 +165,9 @@ class FarmWorldBossTask(BaseCombatTask):
self.sleep(2)
logger.info('Crownless walk to f')
self.walk_until_f(raise_if_not_found=True, time_out=4, backward_time=1)
in_combat = self.wait_until(self.in_combat, raise_if_not_found=False, time_out=10)
if not in_combat: # try click again
self.walk_until_f(raise_if_not_found=True, time_out=4)
try:
self.combat_once()
except CharDeadException: