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

优化长离

Browse Source 
修复长离或安可 可能卡住1秒的问题
This commit is contained in:
firedcto@gmail.com 2024-07-23 10:28:14 +08:00
parent 3a288f0926
commit b521c4a52d
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@ -7,7 +7,7 @@ from src.task.FarmEchoTask import FarmEchoTask
from src.task.FarmWorldBossTask import FarmWorldBossTask from src.task.FarmWorldBossTask import FarmWorldBossTask
from src.task.SkipDialogTask import AutoDialogTask from src.task.SkipDialogTask import AutoDialogTask
version = "v0.0.11" version = "v5.0.11"
def calculate_pc_exe_path(running_path): def calculate_pc_exe_path(running_path):

24
src/char/BaseChar.py
View File

@ -35,7 +35,7 @@ char_lib_check_marks = ['char_1_lib_check_mark', 'char_2_lib_check_mark', 'char_
class BaseChar: class BaseChar:
def __init__(self, task, index, res_cd=0, echo_cd=0): def __init__(self, task, index, res_cd=20, echo_cd=20):
self.white_off_threshold = 0.01 self.white_off_threshold = 0.01
self.echo_cd = echo_cd self.echo_cd = echo_cd
self.task = task self.task = task
@ -74,14 +74,10 @@ class BaseChar:
self.logger.debug(f'set current char false {self.index}') self.logger.debug(f'set current char false {self.index}')
def wait_down(self): def wait_down(self):
start = time.time()
while self.flying(): while self.flying():
self.task.click() self.task.click()
self.sleep(0.2) self.sleep(0.2)
self.task.screenshot(
f'{self}_down_finish_{(time.time() - start):.2f}_f:{self.is_forte_full()}_e:{self.resonance_available()}_r:{self.echo_available()}_q:{self.liberation_available()}_i{self.has_intro}')
def click(self, *args: Any, **kwargs: Any): def click(self, *args: Any, **kwargs: Any):
self.task.click(*args, **kwargs) self.task.click(*args, **kwargs)
@ -118,10 +114,6 @@ class BaseChar:
else: else:
invalid_count += 1 invalid_count += 1
has_cd = invalid_count == 0 and (has_dot and 2 <= number_count <= 3) has_cd = invalid_count == 0 and (has_dot and 2 <= number_count <= 3)
# if self.task.debug:
# msg = f"{self}_{has_cd}_{box_name} number_count {number_count} big_count {big_area_count} invalid_count {invalid_count} has_dot {has_dot}"
# self.task.screenshot(msg, frame=cropped)
# self.logger.debug(msg)
return has_cd return has_cd
def is_available(self, percent, box_name): def is_available(self, percent, box_name):
@ -215,19 +207,21 @@ class BaseChar:
def click_echo(self, duration=0, sleep_time=0): def click_echo(self, duration=0, sleep_time=0):
self.logger.debug(f'click_echo start') self.logger.debug(f'click_echo start')
if self.has_cd('echo'):
self.logger.debug('click_echo has cd return ')
return False
clicked = False clicked = False
start = 0 start = 0
last_click = 0 last_click = 0
while True: while True:
self.check_combat() self.check_combat()
current = self.current_echo() current = self.current_echo()
now = time.time()
if duration == 0 and not self.echo_available(current): if duration == 0 and not self.echo_available(current):
break break
now = time.time() elif duration > 0 and start != 0:
if duration > 0 and start != 0:
if now - start > duration: if now - start > duration:
break break
self.logger.debug(f'click_echo echo_available click')
if now - last_click > 0.1: if now - last_click > 0.1:
if current == 0: if current == 0:
self.task.click() self.task.click()
@ -549,9 +543,9 @@ class BaseChar:
the_area = area the_area = area
ring_count += 1 ring_count += 1
if self.task.debug: # if self.task.debug:
# Save or display the image with contours # Save or display the image with contours
cv2.imwrite(f'test\\test_{self}_{is_full}_{the_area}_{lower_bound}.jpg', image_with_contours) # cv2.imwrite(f'test\\test_{self}_{is_full}_{the_area}_{lower_bound}.jpg', image_with_contours)
if ring_count > 1: if ring_count > 1:
is_full = False is_full = False
the_area = 0 the_area = 0

9
src/char/Changli.py
View File

@ -14,7 +14,7 @@ class Changli(BaseChar):
self.enhanced_normal = False self.enhanced_normal = False
def do_get_switch_priority(self, current_char: BaseChar, has_intro=False): def do_get_switch_priority(self, current_char: BaseChar, has_intro=False):
if time.time() - self.last_e < 3: if time.time() - self.last_e < 4:
self.logger.info( self.logger.info(
f'switch priority MIN because e not finished') f'switch priority MIN because e not finished')
return Priority.MIN return Priority.MIN
@ -22,23 +22,24 @@ class Changli(BaseChar):
return super().do_get_switch_priority(current_char, has_intro) return super().do_get_switch_priority(current_char, has_intro)
def do_perform(self): def do_perform(self):
# self.logger.debug(
# f'Encore_perform_{self.has_intro}_{self.echo_available()}_{self.resonance_available()}_{self.liberation_available()}')
if self.has_intro or self.enhanced_normal: if self.has_intro or self.enhanced_normal:
self.sleep(0.05)
self.normal_attack() self.normal_attack()
self.sleep(0.5) self.sleep(0.5)
self.enhanced_normal = False self.enhanced_normal = False
if self.is_forte_full(): if self.is_forte_full():
self.logger.debug('Changli click heavy attack without ult')
self.heavy_attack(0.8) self.heavy_attack(0.8)
return self.switch_next_char() return self.switch_next_char()
if self.click_liberation(): if self.click_liberation():
self.sleep(0.1)
self.heavy_attack(0.8) self.heavy_attack(0.8)
return self.switch_next_char()
elif self.resonance_available(): elif self.resonance_available():
self.send_resonance_key() self.send_resonance_key()
self.enhanced_normal = True self.enhanced_normal = True
self.normal_attack() self.normal_attack()
elif self.click_echo(1.5): elif self.click_echo(1.5):
self.logger.debug('Changli click echo success')
pass pass
else: else:
self.normal_attack() self.normal_attack()