diff --git a/vite/public/assets/moty/q7-1.mp3 b/vite/public/assets/moty/q7-1.mp3 new file mode 100644 index 0000000..1c76442 Binary files /dev/null and b/vite/public/assets/moty/q7-1.mp3 differ diff --git a/vite/public/assets/moty/q7-2.mp3 b/vite/public/assets/moty/q7-2.mp3 new file mode 100644 index 0000000..2eede3c Binary files /dev/null and b/vite/public/assets/moty/q7-2.mp3 differ diff --git a/vite/public/cuelist_moty.json b/vite/public/cuelist_moty.json index b4f5f42..0f8e493 100644 --- a/vite/public/cuelist_moty.json +++ b/vite/public/cuelist_moty.json @@ -77,18 +77,20 @@ "name": "Q6", "type": "user_input", "description": "call", - "duration": 30, + "duration": 20, "auto": true, - "nextcue": 6.1 + "nextcue": 6.1 }, { "id":6.1, "name":"Q6.1", - "type":"summary", + "type":"export", "auto":true, - "description":"summary", + "description":"export", + "callback":"exportFile", "nextcue":7, - "soundcue":"Q1" + "soundcue":"Q1", + "duration":1 }, { "id": 7, @@ -96,7 +98,7 @@ "type": "phone", "description": "Ending", "auto": true, - "audioFile": "assets/moty/q7.mp3", + "audioFile": "assets/moty/q7-1.mp3", "nextcue": 8, "status":"intro" }, @@ -105,8 +107,8 @@ "name": "Q8", "type": "end", "description": "QRcode", - "status":"end", - "duration": 10, + "status":"end", + "audioFile": "assets/moty/q7-2.mp3", "auto": true, "nextcue": 1 } diff --git a/vite/src/pages/flow_moty.jsx b/vite/src/pages/flow_moty.jsx index f3dba03..c81b18f 100644 --- a/vite/src/pages/flow_moty.jsx +++ b/vite/src/pages/flow_moty.jsx @@ -622,17 +622,17 @@ export function FlowMoty(){ const delay=order*2000; console.log('export delay time:', delay); - setTimeout(()=>{ + // setTimeout(()=>{ if(isTest) { - sendOsc(OSC_ADDRESS.EXPORT, `${getUploadFolder()}#${getDataId()}#${summary||''}#${getFileId(padInput)}#${choice||''}#generated`); // Send OSC export message + sendOsc(OSC_ADDRESS.EXPORT, `${getFileId(padInput)}#generated`); // Send OSC export message }else{ - sendOsc(OSC_ADDRESS.EXPORT, `${getUploadFolder()}#${getDataId()}#${summary||''}#${getFileId(padInput)}#${choice||''}#${default_image?'default':'generated'}`); // Send OSC export message + sendOsc(OSC_ADDRESS.EXPORT, `${getFileId(padInput)}#${default_image?'default':'generated'}`); // Send OSC export message } - }, delay); // random delay between 0.5s to 5.5s + // }, delay); // random delay between 0.5s to 5.5s - writeSheet(); + // writeSheet(); } function startChatTimer(){ @@ -703,19 +703,10 @@ export function FlowMoty(){ let next=cue.nextcue; switch(cue.numpad_type){ case NUMPAD_TYPE.USERID: + case NUMPAD_TYPE.PHONE: console.log('set id', padInput); setUserId(()=>padInput); - break; - case NUMPAD_TYPE.CHOICE: - next=cue.branch[padInput.toString()].nextcue; - 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); - // sendOsc(OSC_ADDRESS.PASSWORD, mess); // Send OSC password message - // sendOsc(OSC_ADDRESS.CHOICE, choice); // Send OSC save choice message - break; + break; } if(next){ @@ -937,7 +928,7 @@ export function FlowMoty(){ startChatTimer(); break; case ChatStatus.Processing: - text = '記憶讀取中'; + text = '美好製作中'; break; case ChatStatus.Message: text = '請留言'; @@ -1016,6 +1007,8 @@ export function FlowMoty(){ setLocalIP(ip); }); + sendOsc(OSC_ADDRESS.STATUS, 'reset'); + },[]);