Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/Scripts/Editor/FBXImporter/processed_fbx.txt # Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx
This commit is contained in:
Ferlat Thibaud
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user