diff --git a/.idea/.idea.RESIDENCY_POC/.idea/.gitignore b/.idea/.idea.RESIDENCY_POC/.idea/.gitignore new file mode 100644 index 00000000..0286b1a5 --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/modules.xml +/projectSettingsUpdater.xml +/contentModel.xml +/.idea.RESIDENCY_POC.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.RESIDENCY_POC/.idea/encodings.xml b/.idea/.idea.RESIDENCY_POC/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.RESIDENCY_POC/.idea/indexLayout.xml b/.idea/.idea.RESIDENCY_POC/.idea/indexLayout.xml new file mode 100644 index 00000000..7b08163c --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.RESIDENCY_POC/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.RESIDENCY_POC/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..c90badcc --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.RESIDENCY_POC/.idea/vcs.xml b/.idea/.idea.RESIDENCY_POC/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assets/OctoDemo/Models/Furnitures/Armchair_A.prefab b/Assets/OctoDemo/Models/Furnitures/Armchair_A.prefab deleted file mode 100644 index d960625b..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Armchair_A.prefab +++ /dev/null @@ -1,89 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &2618402055206790006 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - propertyPath: m_Name - value: Armchair_A - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - insertIndex: -1 - addedObject: {fileID: 5775518361057874154} - m_SourcePrefab: {fileID: 100100000, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} ---- !u!1 &2924814292321426983 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} - m_PrefabInstance: {fileID: 2618402055206790006} - m_PrefabAsset: {fileID: 0} ---- !u!64 &5775518361057874154 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2924814292321426983} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -7733695861077217529, guid: c06b2649582e3ff449d54d9931db8f9d, type: 3} diff --git a/Assets/OctoDemo/Models/Furnitures/Bin_A.prefab b/Assets/OctoDemo/Models/Furnitures/Bin_A.prefab deleted file mode 100644 index 4665e22d..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Bin_A.prefab +++ /dev/null @@ -1,59 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8577077402458938144 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} - propertyPath: m_Name - value: bin_A - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ab07a0ce3e1c9664bb55274b40fea140, type: 3} diff --git a/Assets/OctoDemo/Models/Furnitures/Boiler_A.prefab b/Assets/OctoDemo/Models/Furnitures/Boiler_A.prefab deleted file mode 100644 index 64538e25..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Boiler_A.prefab +++ /dev/null @@ -1,59 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6768917987295155337 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} - propertyPath: m_Name - value: boiler - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d5d3540015d9b9542aed75c39ca4a71a, type: 3} diff --git a/Assets/OctoDemo/Models/Furnitures/CeilingScreen_A.prefab b/Assets/OctoDemo/Models/Furnitures/CeilingScreen_A.prefab deleted file mode 100644 index d0a8cc57..00000000 --- a/Assets/OctoDemo/Models/Furnitures/CeilingScreen_A.prefab +++ /dev/null @@ -1,59 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &272700734125175502 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: df955fddcea22c44ba108674c3613cf5, type: 3} - propertyPath: m_Name - value: ceilingScreen_A - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: df955fddcea22c44ba108674c3613cf5, type: 3} diff --git a/Assets/OctoDemo/Models/Furnitures/Chair_A.prefab b/Assets/OctoDemo/Models/Furnitures/Chair_A.prefab deleted file mode 100644 index 018b5a30..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Chair_A.prefab +++ /dev/null @@ -1,119 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &1764133866439670805 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - propertyPath: m_Name - value: Chair_A - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - insertIndex: -1 - addedObject: {fileID: 3131800971750812026} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - insertIndex: -1 - addedObject: {fileID: 8186709920936978982} - m_SourcePrefab: {fileID: 100100000, guid: 8b3f002e29745db4294c0c97111df417, type: 3} ---- !u!1 &1493541095006683460 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 8b3f002e29745db4294c0c97111df417, type: 3} - m_PrefabInstance: {fileID: 1764133866439670805} - m_PrefabAsset: {fileID: 0} ---- !u!64 &3131800971750812026 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1493541095006683460} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 6449288739317159836, guid: 8b3f002e29745db4294c0c97111df417, type: 3} ---- !u!54 &8186709920936978982 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1493541095006683460} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 diff --git a/Assets/OctoDemo/Models/Furnitures/Chair_A.prefab.meta b/Assets/OctoDemo/Models/Furnitures/Chair_A.prefab.meta deleted file mode 100644 index 45684b52..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Chair_A.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8d8ebe580a2eac0409db4107a8d9c687 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Intercom_A.prefab b/Assets/OctoDemo/Models/Furnitures/Intercom_A.prefab deleted file mode 100644 index 14f2ae61..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Intercom_A.prefab +++ /dev/null @@ -1,59 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &278009420407139869 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} - propertyPath: m_Name - value: intercom_A - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 425b96800f54d9f4b8b57e40443920dd, type: 3} diff --git a/Assets/OctoDemo/Models/Furnitures/Intercom_A.prefab.meta b/Assets/OctoDemo/Models/Furnitures/Intercom_A.prefab.meta deleted file mode 100644 index e07c9868..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Intercom_A.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: faf6be21419bc184c8e958f0bcef8ce6 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/LowTable_A.prefab b/Assets/OctoDemo/Models/Furnitures/LowTable_A.prefab deleted file mode 100644 index c7afe051..00000000 --- a/Assets/OctoDemo/Models/Furnitures/LowTable_A.prefab +++ /dev/null @@ -1,89 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &701844378034122301 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - propertyPath: m_Name - value: LowTable_A - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - insertIndex: -1 - addedObject: {fileID: 1281200796542665654} - m_SourcePrefab: {fileID: 100100000, guid: 494656fe12e424d41ac58f589d42a152, type: 3} ---- !u!1 &395219934236971884 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 494656fe12e424d41ac58f589d42a152, type: 3} - m_PrefabInstance: {fileID: 701844378034122301} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1281200796542665654 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 395219934236971884} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 721246452857395655, guid: 494656fe12e424d41ac58f589d42a152, type: 3} diff --git a/Assets/OctoDemo/Models/Furnitures/LowTable_A.prefab.meta b/Assets/OctoDemo/Models/Furnitures/LowTable_A.prefab.meta deleted file mode 100644 index 02b9d707..00000000 --- a/Assets/OctoDemo/Models/Furnitures/LowTable_A.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 47cf3315281fecf48905dd2f3f142a42 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/SecurityCamera_A.prefab b/Assets/OctoDemo/Models/Furnitures/SecurityCamera_A.prefab deleted file mode 100644 index e2a06530..00000000 --- a/Assets/OctoDemo/Models/Furnitures/SecurityCamera_A.prefab +++ /dev/null @@ -1,59 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &706814477616624684 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalPosition.x - value: -10.96344 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalPosition.z - value: -12.22474 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 7afac586bb790e048b630dddec7e379e, type: 3} - propertyPath: m_Name - value: securityCamera_A - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7afac586bb790e048b630dddec7e379e, type: 3} diff --git a/Assets/OctoDemo/Models/Furnitures/SecurityCamera_A.prefab.meta b/Assets/OctoDemo/Models/Furnitures/SecurityCamera_A.prefab.meta deleted file mode 100644 index e378b0a7..00000000 --- a/Assets/OctoDemo/Models/Furnitures/SecurityCamera_A.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7d4f02b856dc5674385101b817f41744 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx deleted file mode 100644 index 9f0bcc26..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx.meta deleted file mode 100644 index 1cb2dbf5..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: c06b2649582e3ff449d54d9931db8f9d -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} - materials: - materialImportMode: 2 - materialName: 1 - materialSearch: 1 - materialLocation: 0 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx deleted file mode 100644 index 4f59656e..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx.meta deleted file mode 100644 index 4f46f426..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: ab07a0ce3e1c9664bb55274b40fea140 -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} - materials: - materialImportMode: 2 - materialName: 1 - materialSearch: 1 - materialLocation: 0 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx deleted file mode 100644 index 4f1849c4..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx.meta deleted file mode 100644 index e7e0620f..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: d5d3540015d9b9542aed75c39ca4a71a -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} - materials: - materialImportMode: 2 - materialName: 1 - materialSearch: 1 - materialLocation: 0 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx deleted file mode 100644 index f74e59b8..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx deleted file mode 100644 index 578911b8..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx.meta deleted file mode 100644 index ebd9b798..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: 8b3f002e29745db4294c0c97111df417 -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} - materials: - materialImportMode: 2 - materialName: 1 - materialSearch: 1 - materialLocation: 0 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx deleted file mode 100644 index 564ccc0f..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx.meta deleted file mode 100644 index 012ab309..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: 425b96800f54d9f4b8b57e40443920dd -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} - materials: - materialImportMode: 2 - materialName: 1 - materialSearch: 1 - materialLocation: 0 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx deleted file mode 100644 index 0ed18883..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx.meta deleted file mode 100644 index 9728fb0b..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: 494656fe12e424d41ac58f589d42a152 -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} - materials: - materialImportMode: 2 - materialName: 1 - materialSearch: 1 - materialLocation: 0 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx deleted file mode 100644 index 5f2bd50f..00000000 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx and /dev/null differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx.meta deleted file mode 100644 index 25e7144e..00000000 --- a/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: 7afac586bb790e048b630dddec7e379e -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} - materials: - materialImportMode: 2 - materialName: 1 - materialSearch: 1 - materialLocation: 0 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt b/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt index 461928cc..b1611551 100644 --- a/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt +++ b/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt @@ -8,3 +8,22 @@ c5ffa67b650768b48a1dfee14cde0434 RobotHolo5.fbx 9c7ca22fec5fc2346ba0334a486cab7e Chungus.fbx 0aeae8387e5b14d4bac920f0def12124 Robot_Animation_013.fbx 2e9f82ecbb3dd7540a6bcaf166140266 Robot_Animation_013.fbx +c06b2649582e3ff449d54d9931db8f9d armchair_A.fbx +8151b43ce05ee454d935c91f1c40f127 wall_A_deadEnd.fbx +a117ffd897689164e9b74b1b8b10f644 Diapason.fbx +c1945069c65686a48a85348ceba705d4 arms.fbx +42770493577c58b4ab7a2bcfe049da31 wall_A_corner.fbx +425b96800f54d9f4b8b57e40443920dd intercom_A.fbx +b20e627ff4cf8ea4dbf4059c1c381d83 wall_A_cross.fbx +341f068d693d6a74e89cf4af6f1e58d8 wall_A_pillar.fbx +d5d3540015d9b9542aed75c39ca4a71a boiler.fbx +494656fe12e424d41ac58f589d42a152 lowTable_A.fbx +7938ecb9a0326364db0c064473f84e82 wall_A_door_A.fbx +c9052386b99a77d40937f48408e7673c wall_A_straight.fbx +7afac586bb790e048b630dddec7e379e securityCamera_A.fbx +8b3f002e29745db4294c0c97111df417 chair_A.fbx +ab07a0ce3e1c9664bb55274b40fea140 bin_A.fbx +cd786ffadc82e5a409e68f3750372636 wall_A_window_A.fbx +be9f495fe888d0c4eaf53cc022b1eb64 wall_A_T.fbx +5fd19d2221bd83b45bbf93526c6b203e SpiralStairs.fbx +df955fddcea22c44ba108674c3613cf5 ceilingScreen_A.fbx diff --git a/Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx b/Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx index bca63251..db747583 100644 Binary files a/Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx and b/Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A.meta similarity index 77% rename from Assets/OctoDemo/Models/Furnitures.meta rename to Assets/Unheimlich_POC/Content/ceilingScreen_A.meta index e34694d9..8f50e67e 100644 --- a/Assets/OctoDemo/Models/Furnitures.meta +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 667f447919a13d04b99f37047c2fb1ae +guid: 71abe59103f5fec44bea4ef2f526d441 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Animations.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Animations.meta new file mode 100644 index 00000000..578d1409 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6efe0171c497492438c06c4c67878419 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Audio.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Audio.meta new file mode 100644 index 00000000..2db46ebb --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36a871c67c9a7a146be94f9559a26295 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/Materials.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials.meta similarity index 77% rename from Assets/OctoDemo/Models/Furnitures/Sources/Materials.meta rename to Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials.meta index f2ea7485..40b6811a 100644 --- a/Assets/OctoDemo/Models/Furnitures/Sources/Materials.meta +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 228656ccfd4d89347bc5c5d1d745ad59 +guid: 3972061d3ffb55740a74e7c8668a5a11 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat similarity index 87% rename from Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat rename to Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat index 3ab211a3..948ece14 100644 --- a/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6903748558977870173 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion - version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -20,8 +7,8 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: standardSurface1 - m_Shader: {fileID: -6465566751694194690, guid: 5083f469efbb78d4e912bb6fdfac72cd, type: 3} + m_Name: Material + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -30,7 +17,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -41,10 +29,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _BaseTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -111,29 +95,26 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 + - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - - _GlossMapScale: 1 + - _GlossMapScale: 0 - _Glossiness: 0 - - _GlossyReflections: 1 + - _GlossyReflections: 0 - _Metallic: 0 - - _Mode: 3 - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _QueueControl: 0 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 - - _UVSec: 0 + - _Surface: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} @@ -141,3 +122,16 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!114 &8849053000539795 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat.meta similarity index 79% rename from Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat.meta rename to Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat.meta index adaa53fe..04f1b781 100644 --- a/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat.meta +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e6704cf8b1794f4cb82042559b4b480 +guid: 544786bd7f067364b9aab71ba9f0c6a6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs.meta new file mode 100644 index 00000000..afc9d4bf --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1e2f1b744cdf0e46832350fa8617e6a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab new file mode 100644 index 00000000..4516d488 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab @@ -0,0 +1,183 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5597709404049308156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4020561076403134853} + - component: {fileID: 8189770915968391568} + - component: {fileID: 6236338361379681967} + m_Layer: 0 + m_Name: screen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4020561076403134853 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597709404049308156} + serializedVersion: 2 + m_LocalRotation: {x: 0.20080625, y: 0.18398775, z: -0.029575542, w: 0.9617436} + m_LocalPosition: {x: 0.1614288, y: -0.57486486, z: -0.094741866} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5030597752041218194} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8189770915968391568 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597709404049308156} + m_Mesh: {fileID: 6244854566930169998, guid: df955fddcea22c44ba108674c3613cf5, type: 3} +--- !u!23 &6236338361379681967 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597709404049308156} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 544786bd7f067364b9aab71ba9f0c6a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6168612833107812208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5030597752041218194} + - component: {fileID: 2115140119952999807} + - component: {fileID: 5538990238889542783} + m_Layer: 0 + m_Name: ceilingScreen_A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5030597752041218194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6168612833107812208} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4020561076403134853} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2115140119952999807 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6168612833107812208} + m_Mesh: {fileID: -8544068785584307103, guid: df955fddcea22c44ba108674c3613cf5, type: 3} +--- !u!23 &5538990238889542783 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6168612833107812208} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 544786bd7f067364b9aab71ba9f0c6a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/OctoDemo/Models/Furnitures/CeilingScreen_A.prefab.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab.meta similarity index 74% rename from Assets/OctoDemo/Models/Furnitures/CeilingScreen_A.prefab.meta rename to Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab.meta index 264e6f0a..23ec25bf 100644 --- a/Assets/OctoDemo/Models/Furnitures/CeilingScreen_A.prefab.meta +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c0f3b495fae81e4291baeea1ce193d9 +guid: 7b5c3f0bcdc77fe45a123b72fb77d6eb PrefabImporter: externalObjects: {} userData: diff --git a/Assets/OctoDemo/Models/Furnitures/Sources.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources.meta similarity index 77% rename from Assets/OctoDemo/Models/Furnitures/Sources.meta rename to Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources.meta index 43190bb6..fedecd74 100644 --- a/Assets/OctoDemo/Models/Furnitures/Sources.meta +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 914bd41bac8a33e439e5520754414b46 +guid: 3b6def8dd36fda14288432972fcafd99 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx new file mode 100644 index 00000000..465d77ec --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0300cd9585d950578f84ed87f247e8fe3f132a64a82bb98d125d856177b7fdf9 +size 54064 diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx.meta similarity index 100% rename from Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx.meta rename to Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx.meta diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Textures.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Textures.meta new file mode 100644 index 00000000..858f0eb1 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73a19429c2ab25e4398ce32f0d20b819 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/VFX.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/VFX.meta new file mode 100644 index 00000000..5fe1b0f6 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/VFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 067fe3c7873794745a024d7b33251e3d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity b/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity index 961a07c7..f9bd0fdb 100644 --- a/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity +++ b/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity @@ -6808,51 +6808,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 817991563840346717, guid: b3d5e59592bfef844943b9f2e18aabf9, type: 3} m_PrefabInstance: {fileID: 295686348} m_PrefabAsset: {fileID: 0} ---- !u!1 &296588576 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5575782855984327677, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} - m_PrefabInstance: {fileID: 1930280930} - m_PrefabAsset: {fileID: 0} ---- !u!114 &296588579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296588576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a835ee92b0863c9459a0f816c5ff62ac, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAudioListener - isDefaultListener: 1 - bOverrideScalingFactor: 0 - scalingFactor: -1 - listenerId: 0 ---- !u!114 &296588580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296588576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj - m_listeners: - initialListenerList: [] - useDefaultListeners: 1 - isEnvironmentAware: 1 - isStaticObject: 0 - usePositionOffsetData: 0 - m_positionOffsetData: - KeepMe: 0 - positionOffset: {x: 0, y: 0, z: 0} - scalingFactor: 1 - m_posOffsetData: {fileID: 0} - listenerMask: 1 --- !u!1001 &300398049 PrefabInstance: m_ObjectHideFlags: 0 @@ -25434,6 +25389,63 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1521570321769304301, guid: a017078f32a2c314382f7ece1ecaa822, type: 3} m_PrefabInstance: {fileID: 1386212876} m_PrefabAsset: {fileID: 0} +--- !u!1 &1391553828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1391553830} + - component: {fileID: 1391553829} + m_Layer: 0 + m_Name: WwiseGlobal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1391553829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391553828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca8082afa1214454c828fd22641b8692, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkInitializer + InitializationSettings: {fileID: 11400000, guid: de5fd82fbf79ed247b9046e375a4b249, type: 2} + basePath: + language: + defaultPoolSize: 0 + lowerPoolSize: 0 + streamingPoolSize: 0 + memoryCutoffThreshold: 0 + monitorPoolSize: 0 + monitorQueuePoolSize: 0 + callbackManagerBufferSize: 0 + spatialAudioPoolSize: 0 + maxSoundPropagationDepth: 0 + engineLogging: 0 +--- !u!4 &1391553830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391553828} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1392513918 PrefabInstance: m_ObjectHideFlags: 0 @@ -30388,97 +30400,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7977652778530834609, guid: 9d4ef384d30b05644add2b0f2671172d, type: 3} m_PrefabInstance: {fileID: 1638320346} m_PrefabAsset: {fileID: 0} ---- !u!1 &1646163593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1646163596} - - component: {fileID: 1646163595} - - component: {fileID: 1646163594} - m_Layer: 0 - m_Name: AkAmbient - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1646163594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646163593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d8f7c2e3a1433a142b688e469bcd2de5, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAmbient - triggerList: f7e1664c - useOtherObject: 0 - actionOnEventType: 0 - curveInterpolation: 4 - enableActionOnEvent: 0 - data: - idInternal: 0 - valueGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: 491483834b894b14088f646760295150, type: 2} - useCallbacks: 0 - stopSoundOnDestroy: 1 - Callbacks: [] - soundEmitterObject: {fileID: 0} - transitionDuration: 0 - eventIdInternal: 0 - valueGuidInternal: - m_callbackDataInternal: {fileID: 0} - MultiPositionType: 1 - multiPositionTypeLabel: 0 - attenuationSphereColor: {r: 1, g: 0, b: 0, a: 0.1} - LargeModePositions: [] - multiPositionArray: [] ---- !u!114 &1646163595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646163593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj - m_listeners: - initialListenerList: [] - useDefaultListeners: 1 - isEnvironmentAware: 1 - isStaticObject: 0 - usePositionOffsetData: 0 - m_positionOffsetData: - KeepMe: 0 - positionOffset: {x: 0, y: 0, z: 0} - scalingFactor: 1 - m_posOffsetData: {fileID: 0} - listenerMask: 1 ---- !u!4 &1646163596 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646163593} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.484, y: 0.952, z: 5.01} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1648295832 PrefabInstance: m_ObjectHideFlags: 0 @@ -36309,16 +36230,17 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6053283114444666027, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5575782855984327677, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} + - targetCorrespondingSourceObject: {fileID: 2101508725665932610, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} insertIndex: -1 - addedObject: {fileID: 296588580} - - targetCorrespondingSourceObject: {fileID: 5575782855984327677, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} + addedObject: {fileID: 2045371846} + - targetCorrespondingSourceObject: {fileID: 2101508725665932610, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} insertIndex: -1 - addedObject: {fileID: 296588579} + addedObject: {fileID: 2045371845} m_SourcePrefab: {fileID: 100100000, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} --- !u!1 &1931559852 GameObject: @@ -39230,6 +39152,51 @@ Transform: m_CorrespondingSourceObject: {fileID: 817991563840346717, guid: b3d5e59592bfef844943b9f2e18aabf9, type: 3} m_PrefabInstance: {fileID: 2043852463} m_PrefabAsset: {fileID: 0} +--- !u!1 &2045371837 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2101508725665932610, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} + m_PrefabInstance: {fileID: 1930280930} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2045371845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2045371837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a835ee92b0863c9459a0f816c5ff62ac, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAudioListener + isDefaultListener: 1 + bOverrideScalingFactor: 0 + scalingFactor: -1 + listenerId: 0 +--- !u!114 &2045371846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2045371837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj + m_listeners: + initialListenerList: [] + useDefaultListeners: 1 + isEnvironmentAware: 1 + isStaticObject: 0 + usePositionOffsetData: 0 + m_positionOffsetData: + KeepMe: 0 + positionOffset: {x: 0, y: 0, z: 0} + scalingFactor: 1 + m_posOffsetData: {fileID: 0} + listenerMask: 1 --- !u!1001 &2048959932 PrefabInstance: m_ObjectHideFlags: 0 @@ -41207,4 +41174,4 @@ SceneRoots: - {fileID: 1930280930} - {fileID: 1101670451} - {fileID: 1965767837} - - {fileID: 1646163596} + - {fileID: 1391553830} diff --git a/Assets/OctoDemo/Models/Furnitures/Bin_A.prefab.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkConvolutionReverb.pdb.meta similarity index 63% rename from Assets/OctoDemo/Models/Furnitures/Bin_A.prefab.meta rename to Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkConvolutionReverb.pdb.meta index 12ae6b0c..4503f4db 100644 --- a/Assets/OctoDemo/Models/Furnitures/Bin_A.prefab.meta +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkConvolutionReverb.pdb.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 846abad20a56c4442bfceed6d1516006 -PrefabImporter: +guid: 34c1f1bbe507acd448fc94425a572c72 +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/OctoDemo/Models/Furnitures/Armchair_A.prefab.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkMeter.pdb.meta similarity index 63% rename from Assets/OctoDemo/Models/Furnitures/Armchair_A.prefab.meta rename to Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkMeter.pdb.meta index 217770e8..0a195ae0 100644 --- a/Assets/OctoDemo/Models/Furnitures/Armchair_A.prefab.meta +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkMeter.pdb.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 20d1580ab28f44a42b9b3da6bd915975 -PrefabImporter: +guid: 0fcf466f08dd9b4439177ae9f6a2a076 +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/OctoDemo/Models/Furnitures/Boiler_A.prefab.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkMotion.pdb.meta similarity index 63% rename from Assets/OctoDemo/Models/Furnitures/Boiler_A.prefab.meta rename to Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkMotion.pdb.meta index afdabff3..5ab31b77 100644 --- a/Assets/OctoDemo/Models/Furnitures/Boiler_A.prefab.meta +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkMotion.pdb.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: a1a139ddc3417214a9a9e56d1735a790 -PrefabImporter: +guid: c82d7ec196163f64991423bf74429269 +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSidechain.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSidechain.pdb.meta new file mode 100644 index 00000000..177c539c --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSidechain.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6cb5cc6c60a865b4ebbb2bf3c4de0674 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundEngineDLL.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundEngineDLL.pdb.meta new file mode 100644 index 00000000..15ee6891 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundEngineDLL.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a49e34ddd972b8548a9d812d70472ed7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedAir.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedAir.pdb.meta new file mode 100644 index 00000000..bebe337d --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedAir.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f6be9a5bd4c5ba0479b584c8770ec3d4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedGrain.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedGrain.pdb.meta new file mode 100644 index 00000000..84ff714e --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedGrain.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 60b6e97f42842d0409efaa506e183378 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/Auro.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/Auro.pdb.meta new file mode 100644 index 00000000..52ab1e44 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/Auro.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 86d5255903fbabb488efdecc1e90e3e9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/McDSP.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/McDSP.pdb.meta new file mode 100644 index 00000000..7858c116 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/McDSP.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0367716386562a94d9ba5303a1f5719b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/iZotope.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/iZotope.pdb.meta new file mode 100644 index 00000000..c5b456cd --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/iZotope.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0493cf503273a0c4cbc47ad2e92e054e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Debug/AkUnitySoundEngine.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Debug/AkUnitySoundEngine.pdb.meta new file mode 100644 index 00000000..f9cfd5e5 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Debug/AkUnitySoundEngine.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c54ed33b1d33f144aa9bf16f8cc3d902 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.pdb.meta new file mode 100644 index 00000000..141ce8bb --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2461a33203f97944392039996beebce5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Release/AkUnitySoundEngine.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Release/AkUnitySoundEngine.pdb.meta new file mode 100644 index 00000000..0814c2ea --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Release/AkUnitySoundEngine.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d20b7f2497a48a446a7f67150da50bb1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkConvolutionReverb.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkConvolutionReverb.pdb.meta new file mode 100644 index 00000000..214b097a --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkConvolutionReverb.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c7a44024e2016654091364546f74f65b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkMeter.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkMeter.pdb.meta new file mode 100644 index 00000000..793a297e --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkMeter.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 301b78826af21e541b533964e2f7699c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkMotion.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkMotion.pdb.meta new file mode 100644 index 00000000..d7d87bcd --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkMotion.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 01ddfe2701ac3b44ea514d487d9ee3d7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSidechain.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSidechain.pdb.meta new file mode 100644 index 00000000..ce069e83 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSidechain.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e02d8ce30e35d744a82ed1e9d3a04b13 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundEngineDLL.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundEngineDLL.pdb.meta new file mode 100644 index 00000000..f76b7774 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundEngineDLL.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 594a753c1d9367044a90fde7a6bf89a9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedAir.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedAir.pdb.meta new file mode 100644 index 00000000..213ee758 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedAir.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2780cda100375df4d861a844dc55a75d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedGrain.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedGrain.pdb.meta new file mode 100644 index 00000000..1c6e3e86 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedGrain.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0c777cd391b693a4799f6d2334af5d2d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/Auro.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/Auro.pdb.meta new file mode 100644 index 00000000..43180227 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/Auro.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: be063825da61d3043bfe155478b73093 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/McDSP.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/McDSP.pdb.meta new file mode 100644 index 00000000..13bb1cd3 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/McDSP.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c4b58306c7d7eea438ac7a74adc2aad1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/iZotope.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/iZotope.pdb.meta new file mode 100644 index 00000000..6136a98d --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/iZotope.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c699c26efdc8a074d8833bf38bc47eac +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Debug/AkUnitySoundEngine.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Debug/AkUnitySoundEngine.pdb.meta new file mode 100644 index 00000000..b867d29a --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Debug/AkUnitySoundEngine.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51df20af2b1062a46bd86c72537b7143 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Profile/AkUnitySoundEngine.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Profile/AkUnitySoundEngine.pdb.meta new file mode 100644 index 00000000..db9267d0 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Profile/AkUnitySoundEngine.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 85b3a2ca9c840174bac00deb9dd823b9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Release/AkUnitySoundEngine.pdb.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Release/AkUnitySoundEngine.pdb.meta new file mode 100644 index 00000000..28891ac6 --- /dev/null +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Release/AkUnitySoundEngine.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 78ea50cbc521640418d6ccdd134c7b5d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/ProjectDatabase/Runtime/Plugins/Windows/x86_64/DSP/WwiseProjectDatabase.pdb.meta b/Assets/Wwise/ProjectDatabase/Runtime/Plugins/Windows/x86_64/DSP/WwiseProjectDatabase.pdb.meta new file mode 100644 index 00000000..8278f3db --- /dev/null +++ b/Assets/Wwise/ProjectDatabase/Runtime/Plugins/Windows/x86_64/DSP/WwiseProjectDatabase.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 64f4f98867919014dbc369c3de08904b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset b/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset index 887fcd22..1db63ed0 100644 --- a/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset +++ b/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset @@ -73,7 +73,7 @@ MonoBehaviour: m_MaximumHardwareTimeoutMs: 1000 m_DebugOutOfRangeCheckEnabled: 0 m_DebugOutOfRangeLimit: 16 - m_SuspendAudioDuringFocusLoss: 1 + m_SuspendAudioDuringFocusLoss: 0 m_RenderDuringFocusLoss: 0 m_SoundBankPersistentDataPath: m_UseSubFoldersForGeneratedFiles: 0 diff --git a/Assets/Wwise/ScriptableObjects/Mac.asset b/Assets/Wwise/ScriptableObjects/Mac.asset index 36e79b59..bc6d9082 100644 --- a/Assets/Wwise/ScriptableObjects/Mac.asset +++ b/Assets/Wwise/ScriptableObjects/Mac.asset @@ -61,7 +61,6 @@ MonoBehaviour: - AdvancedSettings.m_MaximumHardwareTimeoutMs - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowAttenuationFactor - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowDegrees - - AdvancedSettings.m_SuspendAudioDuringFocusLoss - AdvancedSettings.m_RenderDuringFocusLoss - AdvancedSettings.m_SoundBankPersistentDataPath - AdvancedSettings.m_DebugOutOfRangeCheckEnabled @@ -131,7 +130,7 @@ MonoBehaviour: m_MaximumHardwareTimeoutMs: 1000 m_DebugOutOfRangeCheckEnabled: 0 m_DebugOutOfRangeLimit: 16 - m_SuspendAudioDuringFocusLoss: 1 + m_SuspendAudioDuringFocusLoss: 0 m_RenderDuringFocusLoss: 0 m_SoundBankPersistentDataPath: m_UseSubFoldersForGeneratedFiles: 0 diff --git a/Assets/Wwise/ScriptableObjects/Windows.asset b/Assets/Wwise/ScriptableObjects/Windows.asset index cef51e89..32bbeb8e 100644 --- a/Assets/Wwise/ScriptableObjects/Windows.asset +++ b/Assets/Wwise/ScriptableObjects/Windows.asset @@ -61,7 +61,6 @@ MonoBehaviour: - AdvancedSettings.m_MaximumHardwareTimeoutMs - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowAttenuationFactor - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowDegrees - - AdvancedSettings.m_SuspendAudioDuringFocusLoss - AdvancedSettings.m_RenderDuringFocusLoss - AdvancedSettings.m_SoundBankPersistentDataPath - AdvancedSettings.m_DebugOutOfRangeCheckEnabled @@ -131,7 +130,7 @@ MonoBehaviour: m_MaximumHardwareTimeoutMs: 1000 m_DebugOutOfRangeCheckEnabled: 0 m_DebugOutOfRangeLimit: 16 - m_SuspendAudioDuringFocusLoss: 1 + m_SuspendAudioDuringFocusLoss: 0 m_RenderDuringFocusLoss: 0 m_SoundBankPersistentDataPath: m_UseSubFoldersForGeneratedFiles: 0 diff --git a/Assets/WwiseSettings.xml b/Assets/WwiseSettings.xml index 6568a345..8d127f9e 100644 --- a/Assets/WwiseSettings.xml +++ b/Assets/WwiseSettings.xml @@ -5,8 +5,8 @@ Audio\GeneratedSoundBanks ../RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/ true - true - true + false + false true true true diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 329e85d5..e760e591 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,13 +1,5 @@ { "dependencies": { - "com.bezi.sidekick": { - "version": "file:com.bezi.sidekick", - "depth": 0, - "source": "embedded", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.2.1" - } - }, "com.coiriergraphics.octocore": { "version": "file:OctoCore", "depth": 0, @@ -116,13 +108,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.2.2", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.probuilder": { "version": "6.0.8", "depth": 0, diff --git a/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu b/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu index 12cc4c0d..ef63eedd 100644 --- a/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu +++ b/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu @@ -5,7 +5,7 @@ - + @@ -22,7 +22,7 @@ Log2 - 250 + 10 -200 37