From 46b1c7e1dedd5f319ee7c97c9258a015d85863a5 Mon Sep 17 00:00:00 2001 From: henrisel Date: Sat, 10 Jan 2026 11:53:56 +0200 Subject: [PATCH] fix FishNetworking problems from merging --- Assets/DefaultPrefabObjects.asset | 4 +- .../win/lib/x86_64/fmodstudio.dll.meta | 191 +++++++++++------- .../Prefabs/Characters/BillboardNPC.prefab | 73 +++++++ .../ModelGeneration/ImageGenerationBox.prefab | 75 ++++++- .../ModelGeneration/ModelGenerationBox.prefab | 77 ++++++- .../ModelGenerationManager.prefab | 75 ++++++- .../VoiceTranscriptionBox.prefab | 75 ++++++- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- .../ModeGeneration/VoiceTranscriptionBox.cs | 3 + ProjectSettings/AudioManager.asset | 4 +- ProjectSettings/ProjectSettings.asset | 4 +- 11 files changed, 494 insertions(+), 91 deletions(-) diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index f1599b1e..c0a672cf 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:481ac1b91c2d9f2854982ef24831d5d3176b56d6f83307de8d7de6647226f40a -size 1997 +oid sha256:7deca6e9982aaa23aff989f294b089e4efed6349174a9ed0f7bc8ea38259b04a +size 2411 diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta index 2059acb8..5425ba50 100644 --- a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta @@ -1,78 +1,113 @@ -fileFormatVersion: 2 -guid: 684d4d47a018ed14080e15f4c99b8e86 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 0 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - Linux: - enabled: 1 - settings: - CPU: None - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: None - OSXIntel64: - enabled: 1 - settings: - CPU: AnyCPU - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - SamsungTV: - enabled: 0 - settings: - STV_MODEL: STANDARD_13 - WP8: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - Win: - enabled: 0 - settings: - CPU: None - Win64: - enabled: 1 - settings: - CPU: AnyCPU - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 684d4d47a018ed14080e15f4c99b8e86 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Linux + second: + enabled: 1 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : OSXIntel + second: + enabled: 1 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : SamsungTV + second: + enabled: 0 + settings: + STV_MODEL: STANDARD_13 + - first: + : WP8 + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + SDK: AnySDK + - first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab b/Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab index a716afd9..6abb34d7 100644 --- a/Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab +++ b/Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab @@ -91,6 +91,8 @@ GameObject: - component: {fileID: 6105090838799004608} - component: {fileID: 6238040606326453210} - component: {fileID: 1155083335105893391} + - component: {fileID: 1413215456818694348} + - component: {fileID: 483845010817450077} m_Layer: 0 m_Name: BillboardNPC m_TagString: Untagged @@ -217,6 +219,77 @@ SphereCollider: serializedVersion: 3 m_Radius: 5 m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1413215456818694348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4663194936290788516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 483845010817450077} + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 9749221921362668639 + _sceneNetworkObjects: [] +--- !u!114 &483845010817450077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4663194936290788516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 1413215456818694348} + _networkObjectCache: {fileID: 1413215456818694348} + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 --- !u!1 &7802421088258943189 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/ImageGenerationBox.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/ImageGenerationBox.prefab index 620f34da..bfe7b13b 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/ImageGenerationBox.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ImageGenerationBox.prefab @@ -191,6 +191,8 @@ GameObject: - component: {fileID: 3054822165453666587} - component: {fileID: 6212693736535064192} - component: {fileID: 643945743491794782} + - component: {fileID: 8388680764149718488} + - component: {fileID: 985663478114870780} m_Layer: 0 m_Name: ImageGenerationBox m_TagString: Untagged @@ -299,7 +301,78 @@ MonoBehaviour: m_EditorClassIdentifier: inactiveMaterial: {fileID: 2100000, guid: 707a698b0ec80454a8c68700bca72941, type: 2} loadingMaterial: {fileID: 2100000, guid: 33390c6f2eb32df47809c60975868a0c, type: 2} - voiceTranscriptionTestBox: {fileID: 0} + voiceTranscriptionBox: {fileID: 0} imageDisplay: {fileID: 6899506685386251279} promptSuffix: ', single object, front and side fully visible, realistic style, plain neutral background, clear details, soft studio lighting, true-to-scale' +--- !u!114 &8388680764149718488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8617702063501079407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 985663478114870780} + _networkObjectCache: {fileID: 985663478114870780} + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 +--- !u!114 &985663478114870780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8617702063501079407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 8388680764149718488} + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 16999457738479142014 + _sceneNetworkObjects: [] diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationBox.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationBox.prefab index 85c46f6b..53c6ba29 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationBox.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationBox.prefab @@ -14,6 +14,8 @@ GameObject: - component: {fileID: 6212693736535064192} - component: {fileID: 104473305465913916} - component: {fileID: 998178908997684460} + - component: {fileID: 5068540827769222424} + - component: {fileID: 5717370428422746555} m_Layer: 0 m_Name: ModelGenerationBox m_TagString: Untagged @@ -34,7 +36,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!33 &2692232214199165587 MeshFilter: @@ -122,7 +124,7 @@ MonoBehaviour: inactiveMaterial: {fileID: 2100000, guid: 707a698b0ec80454a8c68700bca72941, type: 2} loadingMaterial: {fileID: 2100000, guid: 33390c6f2eb32df47809c60975868a0c, type: 2} modelSpawnPoint: {fileID: 0} - voiceTranscriptionTestBox: {fileID: 0} + imageGenerationBox: {fileID: 0} --- !u!114 &998178908997684460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -154,3 +156,74 @@ MonoBehaviour: skinUpdateWhenOffscreen: 1 lightIntensityFactor: 1 sceneObjectCreation: 2 +--- !u!114 &5068540827769222424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8617702063501079407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 5717370428422746555} + _networkObjectCache: {fileID: 5717370428422746555} + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 +--- !u!114 &5717370428422746555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8617702063501079407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 5068540827769222424} + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 16834818735520970046 + _sceneNetworkObjects: [] diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab index b607e048..fb371030 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab @@ -13,6 +13,8 @@ GameObject: - component: {fileID: 3363453355800186393} - component: {fileID: 2166102850012183631} - component: {fileID: 8356602476881383464} + - component: {fileID: 4280129837482332964} + - component: {fileID: 8105025160921831064} m_Layer: 0 m_Name: ModelGenerationManager m_TagString: Untagged @@ -33,7 +35,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &426575173390140847 MonoBehaviour: @@ -108,3 +110,74 @@ MonoBehaviour: useVad: 1 tokensTimestamps: 0 audioCtx: 0 +--- !u!114 &4280129837482332964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154411548685861447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 8105025160921831064} + _networkObjectCache: {fileID: 8105025160921831064} + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 +--- !u!114 &8105025160921831064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154411548685861447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 4280129837482332964} + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 17646158845367820466 + _sceneNetworkObjects: [] diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/VoiceTranscriptionBox.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/VoiceTranscriptionBox.prefab index 906474ca..61174b38 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/VoiceTranscriptionBox.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/VoiceTranscriptionBox.prefab @@ -193,6 +193,8 @@ GameObject: - component: {fileID: 4974450515678071712} - component: {fileID: 4391541691227486968} - component: {fileID: 8181450788903950503} + - component: {fileID: 9054548694602850254} + - component: {fileID: 1196880356805443408} m_Layer: 0 m_Name: VoiceTranscriptionBox m_TagString: Untagged @@ -330,10 +332,81 @@ MonoBehaviour: m_EditorClassIdentifier: activeMaterial: {fileID: 2100000, guid: 937c5f357ed270843bd43d1f7d5d475b, type: 2} inactiveMaterial: {fileID: 2100000, guid: 707a698b0ec80454a8c68700bca72941, type: 2} - loadingMaterial: {fileID: 2100000, guid: 33390c6f2eb32df47809c60975868a0c, type: 2} whisper: {fileID: 0} microphoneRecord: {fileID: 4391541691227486968} + microphoneDevice: outputText: {fileID: 4513192310212875305} +--- !u!114 &9054548694602850254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5221842104383226931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 1196880356805443408} + _networkObjectCache: {fileID: 1196880356805443408} + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 +--- !u!114 &1196880356805443408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5221842104383226931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 9054548694602850254} + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 16717644425602052398 + _sceneNetworkObjects: [] --- !u!1 &5819114791296431922 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 3b12abe3..6b207c4c 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dc1041a15e19c0ca7bf06cd9fd60cb0404da5d5cce38f5ae5a3db32d0ab0d0c -size 67042723 +oid sha256:b004b66d38e7989cf5cf7841337a4c90405b8c788bb7a36e05b418d0d81e8bee +size 67844080 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/VoiceTranscriptionBox.cs b/Assets/_PROJECT/Scripts/ModeGeneration/VoiceTranscriptionBox.cs index 016bf042..8fa3051a 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/VoiceTranscriptionBox.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/VoiceTranscriptionBox.cs @@ -13,6 +13,7 @@ public class VoiceTranscriptionBox : MonoBehaviour public WhisperManager whisper; public MicrophoneRecord microphoneRecord; + public string microphoneDevice; public TextMeshProUGUI outputText; private WhisperStream stream; @@ -25,6 +26,8 @@ public class VoiceTranscriptionBox : MonoBehaviour meshRenderer = GetComponent(); Debug.Log("Mic devices: " + string.Join(", ", Microphone.devices)); + Debug.Log("Using mic device: " + microphoneDevice); + microphoneRecord.SelectedMicDevice = microphoneDevice; // This causes about 1 sec long freeze, has to be done once at the start of the game microphoneRecord.StartRecord(); diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index bc6abbd7..061963e3 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7105b1e15f990334af69cbdcfaa594a4a4987ca2525675bc70e807344831d95d -size 446 +oid sha256:c360e8f38f20f70b2e82ee45d8bfaaa8f2e88decfc868628077ea60eea9fbd2f +size 463 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b4226025..982ff64b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc5837b7d78adf751b2a4c72e0dd92059a0ca287b175b10c8b287e9d66e77095 -size 26399 +oid sha256:69667d5279fb448c3347888d340da965b1e2acd14f1bef8f84a74d290ff6970f +size 26836