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

fix stuck on claim

Browse Source
This commit is contained in:
firedcto@gmail.com 2024-07-10 10:46:03 +08:00
parent 24f0957d01
commit 33446f6ac5
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/task/BaseCombatTask.py
View File

@ -197,13 +197,17 @@ class BaseCombatTask(BaseTask, FindFeature, OCR, CombatCheck):
self.sleep(0.2)
self.send_key('f')
self.send_key_up(direction)
if self.wait_click_feature('cancel_button', relative_x=1, raise_if_not_found=False, horizontal_variance=0.1,
vertical_variance=0.1,
use_gray_scale=True, time_out=1, threshold=0.8):
logger.warning(f"found a claim reward")
if self.handle_claim_button():
return False
return f_found
def handle_claim_button(self):
if self.wait_click_feature('cancel_button', relative_x=1, raise_if_not_found=False, horizontal_variance=0.1,
vertical_variance=0.1,
use_gray_scale=True, time_out=2, threshold=0.8):
logger.warning(f"found a claim reward")
return True
def walk_until_f(self, direction='w', time_out=0, raise_if_not_found=True, backward_time=0):
if not self.find_one('pick_up_f', horizontal_variance=0.1, vertical_variance=0.1, threshold=0.8,
use_gray_scale=True):
@ -213,6 +217,8 @@ class BaseCombatTask(BaseTask, FindFeature, OCR, CombatCheck):
return self.send_key_and_wait_f(direction, raise_if_not_found, time_out) and self.sleep(0.5)
else:
self.send_key('f')
if self.handle_claim_button():
return False
self.sleep(0.5)
return True

3
src/task/FarmWorldBossTask.py
View File

@ -129,6 +129,9 @@ class FarmWorldBossTask(BaseCombatTask):
logger.info(f'farm echo combat once start')
self.combat_once()
logger.info(f'farm echo combat end')
if boss_name == 'Bell-Borne Geochelone':
logger.info(f'sleep for the Boss model to disappear')
self.sleep(5)
self.wait_in_team_and_world(time_out=20)
logger.info(f'farm echo move forward walk_until_f to find echo')
if self.walk_until_f(time_out=6, backward_time=1,