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

优化更新 去掉启动器

This commit is contained in:
firedcto@gmail.com 2024-12-27 17:13:18 +08:00
parent 3dfdf8f8dd
commit ffabd8cb92
3 changed files with 7 additions and 6 deletions

View File

@ -1,6 +1,6 @@
if __name__ == '__main__':
from config import config
from ok.OK import OK
from ok import OK
config = config
config['debug'] = True

View File

@ -29,7 +29,7 @@ numpy==1.26.4
# openvino
# rapidocr-openvino
# shapely
ok-script==0.0.412
ok-script==0.0.413
# via -r .\requirements.in
opencv-contrib-python==4.10.0.84
# via -r .\requirements.in

View File

@ -26,7 +26,7 @@ class CharDeadException(NotInCombatException):
key_config_option = ConfigOption('Game Hotkey Config', {
'HotKey Verify': True,
'HotKey Verify': False,
'Echo Key': 'q',
'Liberation Key': 'r',
'Resonance Key': 'e',
@ -45,6 +45,7 @@ class BaseCombatTask(CombatCheck):
self.combat_start = 0
self.char_texts = ['char_1_text', 'char_2_text', 'char_3_text']
self.add_text_fix({'':'e'})
def send_key_and_wait_animation(self, key, check_function, total_wait=7, enter_animation_wait=0.7):
start = time.time()
@ -303,11 +304,11 @@ class BaseCombatTask(CombatCheck):
if not self.key_config['HotKey Verify'] or force:
resonance_key = self.ocr(0.82, 0.92, 0.85, 0.96, match=re.compile(r'^[a-zA-Z]$'), threshold=0.8,
name='resonance_key', use_grayscale=True)
name='resonance_key',log=True)
echo_key = self.ocr(0.88, 0.92, 0.90, 0.96, match=re.compile(r'^[a-zA-Z]$'), threshold=0.8,
name='echo_key')
name='echo_key',log=True)
liberation_key = self.ocr(0.93, 0.92, 0.96, 0.96, match=re.compile(r'^[a-zA-Z]$'), threshold=0.8,
name='liberation_key')
name='liberation_key',log=True)
keys_str = str(resonance_key) + str(echo_key) + str(liberation_key)
if echo_key: