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

修复boss战可能跳出战斗的问题

Browse Source
This commit is contained in:
firedcto@gmail.com 2024-07-28 22:59:45 +08:00
parent c3602b7253
commit 122315ba1e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/combat/CombatCheck.py
View File

@ -151,7 +151,7 @@ class CombatCheck:
else: else:
return self.reset_to_false(recheck=False, reason="boss disappear") return self.reset_to_false(recheck=False, reason="boss disappear")
if not self.check_health_bar(): if not self.check_health_bar():
logger.debug('not in team or no health bar') logger.debug('no health bar')
if not self.target_enemy(): if not self.target_enemy():
logger.error('target_enemy failed, break out of combat') logger.error('target_enemy failed, break out of combat')
return self.reset_to_false(reason='target enemy failed') return self.reset_to_false(reason='target enemy failed')
@ -170,6 +170,8 @@ class CombatCheck:
else: else:
in_combat = self.target_enemy() in_combat = self.target_enemy()
if in_combat: if in_combat:
if not self.boss_lv_template:
self.find_boss_lv_text()
logger.info( logger.info(
f'enter combat cost {(time.time() - start):2f} boss_lv_template:{self.boss_lv_template is not None} boss_health_box:{self.boss_health_box} has_count_down:{self.has_count_down}') f'enter combat cost {(time.time() - start):2f} boss_lv_template:{self.boss_lv_template is not None} boss_health_box:{self.boss_health_box} has_count_down:{self.has_count_down}')
self._in_combat = True self._in_combat = True
@ -201,7 +203,7 @@ class CombatCheck:
return True return True
else: else:
boxes = find_color_rectangles(self.frame, boss_health_color, min_width * 3, min_height * 1.3, boxes = find_color_rectangles(self.frame, boss_health_color, min_width * 3, min_height * 1.3,
box=self.box_of_screen(1269 / 3840, 58 / 2160, 2533 / 3840, 192 / 2160)) box=self.box_of_screen(1269 / 3840, 58 / 2160, 2533 / 3840, 200 / 2160))
if len(boxes) == 1: if len(boxes) == 1:
self.boss_health_box = boxes[0] self.boss_health_box = boxes[0]
self.boss_health_box.width = 10 self.boss_health_box.width = 10
@ -214,7 +216,7 @@ class CombatCheck:
def find_boss_lv_text(self): def find_boss_lv_text(self):
texts = self.ocr(box=self.box_of_screen(1269 / 3840, 10 / 2160, 2533 / 3840, 140 / 2160), texts = self.ocr(box=self.box_of_screen(1269 / 3840, 10 / 2160, 2533 / 3840, 140 / 2160),
target_height=540) target_height=540, name='boss_lv_text')
boss_lv_texts = find_boxes_by_name(texts, boss_lv_texts = find_boxes_by_name(texts,
[re.compile(r'(?i)^L[V].*')]) [re.compile(r'(?i)^L[V].*')])
if len(boss_lv_texts) > 0: if len(boss_lv_texts) > 0: