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

修复无音区有双倍奖励的时候无法完成一条龙

Browse Source
This commit is contained in:
firedcto@gmail.com 2025-04-07 10:15:31 +08:00
parent 51d9e4e441
commit e04788c823
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/combat/CombatCheck.py
View File

@ -27,6 +27,7 @@ class CombatCheck(BaseWWTask):
self.combat_check_interval = 0.5
self.last_in_realm_not_combat = 0
self._last_liberation = 0
self.target_enemy_time_out = 3
@property
def in_liberation(self):
@ -186,7 +187,7 @@ class CombatCheck(BaseWWTask):
return True
else:
logger.info(f'target lost try retarget')
return self.wait_until(self.has_target, time_out=3.1,
return self.wait_until(self.has_target, time_out=self.target_enemy_time_out,
pre_action=lambda: self.middle_click(interval=0.2))
def check_health_bar(self):

1
src/task/BaseCombatTask.py
View File

@ -32,7 +32,6 @@ class BaseCombatTask(CombatCheck):
self.chars = [None, None, None]
self.char_texts = ['char_1_text', 'char_2_text', 'char_3_text']
self.key_config = self.get_global_config('Game Hotkey Config')
self.mouse_pos = None
self.combat_start = 0

6
src/task/TacetTask.py
View File

@ -19,6 +19,7 @@ class TacetTask(WWOneTimeTask, BaseCombatTask):
}
self.row_per_page = 5
self.total_number = 11
self.target_enemy_time_out = 6
default_config.update(self.default_config)
self.config_description = {
'Which Tacet Suppression to Farm': 'the Nth number in the Tacet Suppression list (F2)',
@ -63,14 +64,13 @@ class TacetTask(WWOneTimeTask, BaseCombatTask):
else:
self.walk_until_f(time_out=4, backward_time=0, raise_if_not_found=True)
self.combat_once()
self.sleep(2)
self.walk_to_treasure()
used, remaining_total, remaining_current, used_back_up = self.ensure_stamina(60, 120)
total_used += used
self.info_set('used stamina', total_used)
if not used:
return self.not_enough_stamina()
self.wait_click_ocr(0.02, 0.56, 0.67, 0.67, match=str(used), raise_if_not_found=True)
self.wait_click_ocr(0.2, 0.56, 0.75, 0.69, match=[str(used), '确认', 'Confirm'], raise_if_not_found=True, log=True)
self.sleep(4)
self.click(0.51, 0.84, after_sleep=1)
if remaining_total < 60:
@ -108,7 +108,7 @@ class TacetTask(WWOneTimeTask, BaseCombatTask):
self.log_info(f'teleport_to_tacet scroll down a page new index: {index}')
x = 0.88
height = (0.85 - 0.28) / 4
y = 0.25
y = 0.275
y += height * index
self.click_relative(x, y, after_sleep=2)