diff --git a/vite/public/assets/ai/ai-09-ai-10-bg-05.mp3 b/vite/public/assets/ai/ai-09-ai-10-bg-05.mp3 index e909517..37de3f0 100644 Binary files a/vite/public/assets/ai/ai-09-ai-10-bg-05.mp3 and b/vite/public/assets/ai/ai-09-ai-10-bg-05.mp3 differ diff --git a/vite/public/assets/ai/sfx-03-ai-03.mp3 b/vite/public/assets/ai/sfx-03-ai-03.mp3 index 560b76c..38d8618 100644 Binary files a/vite/public/assets/ai/sfx-03-ai-03.mp3 and b/vite/public/assets/ai/sfx-03-ai-03.mp3 differ diff --git a/vite/public/cuelist_demo3.json b/vite/public/cuelist_demo3.json index 0dc98cd..313be55 100644 --- a/vite/public/cuelist_demo3.json +++ b/vite/public/cuelist_demo3.json @@ -16,7 +16,7 @@ "type": "headphone", "description": "Guide for drink", "auto": true, - "audioFile": "assets/record/record-01(小束袋).mp3", + "audioFile": "assets/record/Record 01 (0905).mp3", "nextcue": 3, "status":"reset" }, @@ -26,7 +26,7 @@ "description": "Guide for phone", "type": "headphone", "auto": true, - "audioFile": "assets/record/record-02.mp3", + "audioFile": "assets/record/Record 02 (0905).mp3", "nextcue":4 }, { @@ -65,10 +65,9 @@ "type": "phone", "description": "裝置啟動音效", "auto": true, - "audioFile": "assets/sfx/sfx-04.mp3", + "audioFile": "assets/ai/ai-03-sfx-04.mp3", "nextcue": 4.2, - "status":"intro", - "callback":"fade_out_light" + "status":"intro" }, { "id": 4.2, @@ -162,7 +161,8 @@ "description":"end", "auto": false, "audioFile": "assets/ai/ai-09-ai-10-bg-05.mp3", - "fadeout": true + "fadeout": true, + "callback":"exportFile" }, { "id": 6, diff --git a/vite/public/favicon.ico b/vite/public/favicon.ico deleted file mode 100644 index 45dc02e..0000000 Binary files a/vite/public/favicon.ico and /dev/null differ diff --git a/vite/src-tauri/icons/128x128.png b/vite/src-tauri/icons/128x128.png index 77e7d23..3f7c66f 100644 Binary files a/vite/src-tauri/icons/128x128.png and b/vite/src-tauri/icons/128x128.png differ diff --git a/vite/src-tauri/icons/128x128@2x.png b/vite/src-tauri/icons/128x128@2x.png index 0f7976f..166bc3e 100644 Binary files a/vite/src-tauri/icons/128x128@2x.png and b/vite/src-tauri/icons/128x128@2x.png differ diff --git a/vite/src-tauri/icons/32x32.png b/vite/src-tauri/icons/32x32.png index 98fda06..f95a3c8 100644 Binary files a/vite/src-tauri/icons/32x32.png and b/vite/src-tauri/icons/32x32.png differ diff --git a/vite/src-tauri/icons/Square107x107Logo.png b/vite/src-tauri/icons/Square107x107Logo.png index f35d84f..29c5d7e 100644 Binary files a/vite/src-tauri/icons/Square107x107Logo.png and b/vite/src-tauri/icons/Square107x107Logo.png differ diff --git a/vite/src-tauri/icons/Square142x142Logo.png b/vite/src-tauri/icons/Square142x142Logo.png index 1823bb2..a2c51d6 100644 Binary files a/vite/src-tauri/icons/Square142x142Logo.png and b/vite/src-tauri/icons/Square142x142Logo.png differ diff --git a/vite/src-tauri/icons/Square150x150Logo.png b/vite/src-tauri/icons/Square150x150Logo.png index dc2b22c..50fc2ac 100644 Binary files a/vite/src-tauri/icons/Square150x150Logo.png and b/vite/src-tauri/icons/Square150x150Logo.png differ diff --git a/vite/src-tauri/icons/Square284x284Logo.png b/vite/src-tauri/icons/Square284x284Logo.png index 0ed3984..918e509 100644 Binary files a/vite/src-tauri/icons/Square284x284Logo.png and b/vite/src-tauri/icons/Square284x284Logo.png differ diff --git a/vite/src-tauri/icons/Square30x30Logo.png b/vite/src-tauri/icons/Square30x30Logo.png index 60bf0ea..34e1d33 100644 Binary files a/vite/src-tauri/icons/Square30x30Logo.png and b/vite/src-tauri/icons/Square30x30Logo.png differ diff --git a/vite/src-tauri/icons/Square310x310Logo.png b/vite/src-tauri/icons/Square310x310Logo.png index c8ca0ad..5d40c43 100644 Binary files a/vite/src-tauri/icons/Square310x310Logo.png and b/vite/src-tauri/icons/Square310x310Logo.png differ diff --git a/vite/src-tauri/icons/Square44x44Logo.png b/vite/src-tauri/icons/Square44x44Logo.png index 8756459..98ba1a6 100644 Binary files a/vite/src-tauri/icons/Square44x44Logo.png and b/vite/src-tauri/icons/Square44x44Logo.png differ diff --git a/vite/src-tauri/icons/Square71x71Logo.png b/vite/src-tauri/icons/Square71x71Logo.png index 2c8023c..d76975d 100644 Binary files a/vite/src-tauri/icons/Square71x71Logo.png and b/vite/src-tauri/icons/Square71x71Logo.png differ diff --git a/vite/src-tauri/icons/Square89x89Logo.png b/vite/src-tauri/icons/Square89x89Logo.png index 2c5e603..47f9bcc 100644 Binary files a/vite/src-tauri/icons/Square89x89Logo.png and b/vite/src-tauri/icons/Square89x89Logo.png differ diff --git a/vite/src-tauri/icons/StoreLogo.png b/vite/src-tauri/icons/StoreLogo.png index 17d142c..bad2f15 100644 Binary files a/vite/src-tauri/icons/StoreLogo.png and b/vite/src-tauri/icons/StoreLogo.png differ diff --git a/vite/src-tauri/icons/icon.icns b/vite/src-tauri/icons/icon.icns index a2993ad..2062d04 100644 Binary files a/vite/src-tauri/icons/icon.icns and b/vite/src-tauri/icons/icon.icns differ diff --git a/vite/src-tauri/icons/icon.ico b/vite/src-tauri/icons/icon.ico index 06c23c8..98804f4 100644 Binary files a/vite/src-tauri/icons/icon.ico and b/vite/src-tauri/icons/icon.ico differ diff --git a/vite/src-tauri/icons/icon.png b/vite/src-tauri/icons/icon.png index d1756ce..25db158 100644 Binary files a/vite/src-tauri/icons/icon.png and b/vite/src-tauri/icons/icon.png differ diff --git a/vite/src/pages/flow_free.jsx b/vite/src/pages/flow_free.jsx index 3578237..68e2ff1 100644 --- a/vite/src/pages/flow_free.jsx +++ b/vite/src/pages/flow_free.jsx @@ -337,6 +337,10 @@ export function FreeFlow(){ }); } + if(cue.callback=='exportFile'){ + exportFile(); + } + // control unity if(cue.status && cue.status!='go') { @@ -417,6 +421,14 @@ export function FreeFlow(){ setPadInput(mess); } + function exportFile(){ + const user_input = history.find(msg => msg.role === 'user'); + const default_image=!(user_input && user_input.content.trim() !== ''); + + sendOsc(OSC_ADDRESS.EXPORT, `${getUploadFolder()}#${getDataId()}#${summary||''}#${getFileId(padInput)}#${choice||''}#${default_image?'default':'generated'}`); // Send OSC export message + + } + useEffect(()=>{ @@ -438,10 +450,6 @@ export function FreeFlow(){ case NUMPAD_TYPE.PASSWORD: setPassword(()=>padInput); // sendOsc(OSC_ADDRESS.PASSWORD, mess); // Send OSC password message - const user_input = history.find(msg => msg.role === 'user'); - const default_image=!(user_input && user_input.content.trim() !== ''); - - sendOsc(OSC_ADDRESS.EXPORT, `${getUploadFolder()}#${getDataId()}#${summary||''}#${getFileId(padInput)}#${choice||''}#${default_image?'default':'generated'}`); // Send OSC export message sendOsc(OSC_ADDRESS.CHOICE, choice); // Send OSC save choice message break; }