From e30a27e8b241ba3d1bd76c0b7871d374481dd753 Mon Sep 17 00:00:00 2001 From: reng Date: Sat, 13 Sep 2025 19:36:51 +0800 Subject: [PATCH] update --- public/cuelist.json | 13 ++++++++----- src-tauri/tauri.conf.json | 4 ++-- src/App.jsx | 9 +++++++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/public/cuelist.json b/public/cuelist.json index 68ec518..a086a18 100644 --- a/public/cuelist.json +++ b/public/cuelist.json @@ -6,7 +6,8 @@ "type": "bg", "description": "preset bg", "audioCue": "Q0", - "clientCue":"Q1" + "clientCue":"Q1", + "reset":true }, { "id": 2, @@ -23,7 +24,8 @@ "audioCue": "Q3", "clientCue":"Q2", "duration":482, - "auto": true + "auto": true, + "reset":true }, { "id": 4, @@ -53,7 +55,8 @@ "clientCue":"Q4", "duration":97, "auto":true, - "debug":true + "debug":true, + "reset":true },{ "id": 7, "name": "CQ4.11", @@ -66,8 +69,8 @@ "debug":true }, { - "id": 5, - "name": "Q5", + "id": 8, + "name": "dQ5", "type": "bg", "description": "debug-(END)", "audioCue": "Q4", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 990c4ef..76fddcd 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -13,8 +13,8 @@ "windows": [ { "title": "control-panel", - "width": 1200, - "height": 600 + "width": 1560, + "height": 800 } ], "security": { diff --git a/src/App.jsx b/src/App.jsx index 54d2eb2..fdb1809 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -123,6 +123,11 @@ function App() { if(props.lightCue=='fade_in_light') refLight.current.fadeIn(); // Fade in light for conversation start if(props.lightCue=='fade_out_light') refLight.current.fadeOut(); // Fade out light for conversation end + } + if(props.reset){ + sendOsc(OSC_ADDRESS.RESETCUE,'','all'); + refLight.current.set(1); + } if(props.duration){ @@ -312,8 +317,8 @@ function App() { - {cuelist?.filter(c=>c.clientCue).map(c=>( - ))}