diff --git a/best0.pt b/best0.pt index d6476c0..d19e0c8 100644 Binary files a/best0.pt and b/best0.pt differ diff --git a/config.json b/config.json index df339b4..7c4946a 100644 --- a/config.json +++ b/config.json @@ -1,20 +1,20 @@ { "groups": [ { - "name": "配置组1", - "serial_port": "COM10", + "name": "电脑2", + "serial_port": "COM12", "serial_baudrate": 9600, - "camera_index": 0, + "camera_index": 1, "camera_width": 1920, "camera_height": 1080, - "move_velocity": 470, + "move_velocity": 315, "active": false }, { - "name": "火炬游戏", + "name": "服务器", "serial_port": "COM11", "serial_baudrate": 9600, - "camera_index": 1, + "camera_index": 0, "camera_width": 1920, "camera_height": 1080, "move_velocity": 470, @@ -22,12 +22,12 @@ } ], "display": { - "preview_width": 1000, - "preview_height": 700, - "preview_columns": 2, - "preview_rows": 2, + "preview_width": 1920, + "preview_height": 1080, + "preview_columns": 1, + "preview_rows": 1, "show_preview": true, "preview_multi_window": false, - "preview_use_all_groups": true + "preview_use_all_groups": false } } \ No newline at end of file diff --git a/launcher.py b/launcher.py index 6912d8f..9afd1c5 100644 --- a/launcher.py +++ b/launcher.py @@ -22,7 +22,7 @@ def create_launcher(): """创建启动器界面""" root = tk.Tk() root.title("火炬之光自动化 - 启动器") - root.geometry("400x380") + root.geometry("400x580") root.resizable(False, False) # 标题 diff --git a/main.py b/main.py index 01c1bf3..2a9c50e 100644 --- a/main.py +++ b/main.py @@ -260,11 +260,8 @@ while True: if shizi.fuhuo(im_opencv[0]): print('点击复活') mouse_gui.send_data_absolute(left + 536, top + 627, may=1) - - - - time.sleep(0.15) - keyboard.release() + time.sleep(0.15) + keyboard.release() continue if shizi.tuichu(im_opencv[0]) and detections['next'] is None and len(detections['daojv']) == 0 and len(detections['gw']) == 0 and boss_pd: print("识别到可以退出挑战!!!!!!!!!!!!!!!!!!")