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

Merge pull request #171 from medicinemelancholy/pr1

Browse Source 
修复战斗中锁定丢失
This commit is contained in:
ok-oldking 2024-11-15 10:50:04 +08:00 committed by GitHub
commit c78e138fd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/combat/CombatCheck.py
View File

@ -162,6 +162,7 @@ class CombatCheck(BaseWWTask):
now = time.time() now = time.time()
if now - self.last_combat_check > self.combat_check_interval: if now - self.last_combat_check > self.combat_check_interval:
self.last_combat_check = now self.last_combat_check = now
self.reaim_enemy()
if self.check_team: if self.check_team:
if not self.in_team()[0]: if not self.in_team()[0]:
logger.info('not in team break out of combat') logger.info('not in team break out of combat')
@ -240,6 +241,12 @@ class CombatCheck(BaseWWTask):
elif self._in_multiplayer: elif self._in_multiplayer:
return self.in_multiplayer() return self.in_multiplayer()
def reaim_enemy(self):
aim_percent = self.calculate_color_percentage(aim_color, self.get_box_by_name('box_target_enemy'))
if aim_percent == 0:
logger.info(f'Not focus on enemies, aim percent {aim_percent} ')
self.middle_click()
def target_enemy(self, wait=True): def target_enemy(self, wait=True):
if not wait: if not wait:
self.middle_click() self.middle_click()
@ -353,3 +360,9 @@ boss_health_color = {
'g': (30, 185), # Green range 'g': (30, 185), # Green range
'b': (4, 75) # Blue range 'b': (4, 75) # Blue range
} }
aim_color = {
'r': (165, 175), # Red range
'g': (150, 160), # Green range
'b': (38, 48) # Blue range
}