fix FishNetworking problems from merging

2026-01-10 11:53:56 +02:00
parent e4d61a6648
commit 46b1c7e1de
11 changed files with 494 additions and 91 deletions
--- 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: 
+  <IsNested>k__BackingField: 0
+  <ComponentIndex>k__BackingField: 0
+  <PredictedSpawn>k__BackingField: {fileID: 0}
+  _networkBehaviours:
+  - {fileID: 8388680764149718488}
+  <ParentNetworkObject>k__BackingField: {fileID: 0}
+  <ChildNetworkObjects>k__BackingField: []
+  _isNetworked: 1
+  _isGlobal: 0
+  _initializeOrder: 0
+  _defaultDespawnType: 0
+  NetworkObserver: {fileID: 0}
+  <PrefabId>k__BackingField: 0
+  <SpawnableCollectionId>k__BackingField: 0
+  _scenePathHash: 0
+  <SceneId>k__BackingField: 0
+  <AssetPathHash>k__BackingField: 16999457738479142014
+  _sceneNetworkObjects: []
--- 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: 
+  <IsNested>k__BackingField: 0
+  <ComponentIndex>k__BackingField: 0
+  <PredictedSpawn>k__BackingField: {fileID: 0}
+  _networkBehaviours:
+  - {fileID: 5068540827769222424}
+  <ParentNetworkObject>k__BackingField: {fileID: 0}
+  <ChildNetworkObjects>k__BackingField: []
+  _isNetworked: 1
+  _isGlobal: 0
+  _initializeOrder: 0
+  _defaultDespawnType: 0
+  NetworkObserver: {fileID: 0}
+  <PrefabId>k__BackingField: 0
+  <SpawnableCollectionId>k__BackingField: 0
+  _scenePathHash: 0
+  <SceneId>k__BackingField: 0
+  <AssetPathHash>k__BackingField: 16834818735520970046
+  _sceneNetworkObjects: []
--- 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: 
+  <IsNested>k__BackingField: 0
+  <ComponentIndex>k__BackingField: 0
+  <PredictedSpawn>k__BackingField: {fileID: 0}
+  _networkBehaviours:
+  - {fileID: 4280129837482332964}
+  <ParentNetworkObject>k__BackingField: {fileID: 0}
+  <ChildNetworkObjects>k__BackingField: []
+  _isNetworked: 1
+  _isGlobal: 0
+  _initializeOrder: 0
+  _defaultDespawnType: 0
+  NetworkObserver: {fileID: 0}
+  <PrefabId>k__BackingField: 0
+  <SpawnableCollectionId>k__BackingField: 0
+  _scenePathHash: 0
+  <SceneId>k__BackingField: 0
+  <AssetPathHash>k__BackingField: 17646158845367820466
+  _sceneNetworkObjects: []
--- 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: 
+  <IsNested>k__BackingField: 0
+  <ComponentIndex>k__BackingField: 0
+  <PredictedSpawn>k__BackingField: {fileID: 0}
+  _networkBehaviours:
+  - {fileID: 9054548694602850254}
+  <ParentNetworkObject>k__BackingField: {fileID: 0}
+  <ChildNetworkObjects>k__BackingField: []
+  _isNetworked: 1
+  _isGlobal: 0
+  _initializeOrder: 0
+  _defaultDespawnType: 0
+  NetworkObserver: {fileID: 0}
+  <PrefabId>k__BackingField: 0
+  <SpawnableCollectionId>k__BackingField: 0
+  _scenePathHash: 0
+  <SceneId>k__BackingField: 0
+  <AssetPathHash>k__BackingField: 16717644425602052398
+  _sceneNetworkObjects: []
 --- !u!1 &5819114791296431922
 GameObject:
  m_ObjectHideFlags: 0