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-17 09:32:25 +08:00
parent fe780c6ab4
commit 461a317842
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/task/BaseWWTask.py
View File

@ -141,7 +141,7 @@ class BaseWWTask(BaseTask):
return None return None
return f return f
def walk_to_yolo_echo(self, time_out=15): def walk_to_yolo_echo(self, time_out=15, update_function=None):
last_direction = None last_direction = None
start = time.time() start = time.time()
no_echo_start = 0 no_echo_start = 0
@ -174,6 +174,8 @@ class BaseWWTask(BaseTask):
else: else:
next_direction = 'a' next_direction = 'a'
last_direction = self._walk_direction(last_direction, next_direction) last_direction = self._walk_direction(last_direction, next_direction)
if update_function is not None:
update_function()
self._stop_last_direction(last_direction) self._stop_last_direction(last_direction)
@ -438,7 +440,7 @@ class BaseWWTask(BaseTask):
result = self.executor.ocr_lib(image, use_det=True, use_cls=False, use_rec=True) result = self.executor.ocr_lib(image, use_det=True, use_cls=False, use_rec=True)
self.logger.info(f'ocr_result {result}') self.logger.info(f'ocr_result {result}')
def find_echos(self, threshold=0.46): def find_echos(self, threshold=0.3):
""" """
Main function to load ONNX model, perform inference, draw bounding boxes, and display the output image. Main function to load ONNX model, perform inference, draw bounding boxes, and display the output image.
@ -490,7 +492,7 @@ class BaseWWTask(BaseTask):
self.log_debug('found a echo picked') self.log_debug('found a echo picked')
return True return True
def yolo_find_echo(self, use_color=False, turn=True): def yolo_find_echo(self, use_color=False, turn=True, update_function=None):
if self.debug: if self.debug:
# self.draw_boxes('echo', echos) # self.draw_boxes('echo', echos)
self.screenshot('yolo_echo_start') self.screenshot('yolo_echo_start')
@ -509,7 +511,7 @@ class BaseWWTask(BaseTask):
if echos: if echos:
self.log_info(f'yolo found echo {echos}') self.log_info(f'yolo found echo {echos}')
# return self.walk_to_box(self.find_echos, time_out=15, end_condition=self.pick_echo), max_echo_count > 1 # return self.walk_to_box(self.find_echos, time_out=15, end_condition=self.pick_echo), max_echo_count > 1
return self.walk_to_yolo_echo(), max_echo_count > 1 return self.walk_to_yolo_echo(update_function=update_function), max_echo_count > 1
if use_color: if use_color:
color_percent = self.calculate_color_percentage(echo_color, front_box) color_percent = self.calculate_color_percentage(echo_color, front_box)
self.log_debug(f'pick_echo color_percent:{color_percent}') self.log_debug(f'pick_echo color_percent:{color_percent}')
@ -518,7 +520,7 @@ class BaseWWTask(BaseTask):
# self.screenshot('echo_color_picked') # self.screenshot('echo_color_picked')
self.log_debug(f'found color_percent {color_percent} > {color_threshold}, walk now') self.log_debug(f'found color_percent {color_percent} > {color_threshold}, walk now')
#return self.walk_to_box(self.find_echos, time_out=15, end_condition=self.pick_echo), max_echo_count > 1 #return self.walk_to_box(self.find_echos, time_out=15, end_condition=self.pick_echo), max_echo_count > 1
return self.walk_to_yolo_echo(), max_echo_count > 1 return self.walk_to_yolo_echo(update_function=update_function), max_echo_count > 1
if not turn and i == 0: if not turn and i == 0:
return False, max_echo_count > 1 return False, max_echo_count > 1
self.send_key('a', down_time=0.05) self.send_key('a', down_time=0.05)

BIN
tests/images/echo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB