From eb391c04d2d38018f142901ee1815cd3b42f04fc Mon Sep 17 00:00:00 2001 From: ULTRACOMBOS-DEV Date: Sun, 14 Sep 2025 15:07:56 +0800 Subject: [PATCH] update --- vite/src/comps/debug.jsx | 3 ++- vite/src/pages/flow_free.jsx | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/vite/src/comps/debug.jsx b/vite/src/comps/debug.jsx index 5ba89b2..25d0238 100644 --- a/vite/src/comps/debug.jsx +++ b/vite/src/comps/debug.jsx @@ -3,7 +3,7 @@ import { useData } from '../util/useData.jsx'; export const TEST_PROMPT='a window frame, beach outside, island far away'; -export function DebugControl({refLight}){ +export function DebugControl({onReset}){ const {data} = useData(); @@ -17,6 +17,7 @@ export function DebugControl({refLight}){
diff --git a/vite/src/pages/flow_free.jsx b/vite/src/pages/flow_free.jsx index f18528b..6d09289 100644 --- a/vite/src/pages/flow_free.jsx +++ b/vite/src/pages/flow_free.jsx @@ -97,10 +97,12 @@ export function FreeFlow(){ setSummary(null); reset(); + resetUser(); sendOsc(OSC_ADDRESS.CHOICE, 'reset'); sendOsc(OSC_ADDRESS.SPEECH, 'stop'); setPadInput(); + setChoice(); } function onOsc(payload){ @@ -429,13 +431,13 @@ export function FreeFlow(){ } sendOsc(OSC_ADDRESS.SPEECH, 'stop'); - if(cue.numpad_type=='password'){ + if(cue.numpad_type=='choice'){ if(!choice){ console.log('set default choice to save'); setChoice('save'); sendOsc(OSC_ADDRESS.CHOICE, 'save'); // Send OSC save choice message }else{ - sendOsc(OSC_ADDRESS.CHOICE, choice); // Send OSC save choice message + // sendOsc(OSC_ADDRESS.CHOICE, choice); // Send OSC save choice message } } @@ -497,7 +499,8 @@ export function FreeFlow(){ break; case NUMPAD_TYPE.CHOICE: next=cue.branch[padInput.toString()].nextcue; - setChoice(()=>cue.branch[padInput.toString()].description); // Set choice for user input + setChoice(()=>cue.branch[padInput.toString()].description); // Set choice for user input + sendOsc(OSC_ADDRESS.CHOICE, cue.branch[padInput.toString()].description); break; case NUMPAD_TYPE.PASSWORD: setPassword(padInput); @@ -766,7 +769,7 @@ export function FreeFlow(){ PC {data?.id} {localIP || '...'}
- +
{refCurrentCue.current?.name}