Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/_Content/Scenes/Theatre.unity
This commit is contained in:
PC_PEPIN_KOJO\lucjo
@@ -2905,6 +2905,72 @@ MeshFilter:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 278570584}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1001 &281343427
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 935425196}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.85
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7511558181221131132, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: ddcf93e8a460680418f04a5705492690, type: 2}
|
||||
- target: {fileID: 919132149155446097, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: stageMachine
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
--- !u!4 &281343428 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9c1c9f9f11ea8d94384821a22efb3097, type: 3}
|
||||
m_PrefabInstance: {fileID: 281343427}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &294060740 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6898402875533249877, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
@@ -4099,6 +4165,7 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 473823046}
|
||||
- component: {fileID: 473823045}
|
||||
- component: {fileID: 473823047}
|
||||
m_Layer: 0
|
||||
m_Name: WwiseGlobal
|
||||
m_TagString: Untagged
|
||||
@@ -4146,6 +4213,18 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &473823047
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 473823044}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a732b4b9bbfc16c4ab4d5c50a810287d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::WwiseGlobalGuard
|
||||
--- !u!1 &478876090
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -8282,6 +8361,11 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 992638687589661580, guid: 8a998c00fc583a54082d05343d747b99, type: 3}
|
||||
m_PrefabInstance: {fileID: 934809057}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &935425196 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2589383517841344387, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
m_PrefabInstance: {fileID: 1720943979}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &939771951
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -11209,6 +11293,7 @@ Transform:
|
||||
- {fileID: 920731359}
|
||||
- {fileID: 1984523224}
|
||||
- {fileID: 722758632}
|
||||
- {fileID: 1843195561}
|
||||
m_Father: {fileID: 1196872730}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1184696428
|
||||
@@ -14979,11 +15064,6 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
Triggered: 0
|
||||
- Progression: 0.994
|
||||
OnReached:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
Triggered: 0
|
||||
--- !u!1001 &1720943979
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -16176,6 +16256,10 @@ PrefabInstance:
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 2147483647
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1331111560748878106, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 12.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1312609810001303520, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 2147483647
|
||||
@@ -16222,7 +16306,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -940548234718113564, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -7.95
|
||||
value: -9.525527
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -921236292533121115, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
@@ -16698,7 +16782,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2133916062449854281, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -10.22
|
||||
value: -11.285999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2150719617786173242, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
@@ -17586,7 +17670,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7771745088812432972, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -10.22
|
||||
value: -11.285999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7809351294888787489, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
@@ -17929,6 +18013,9 @@ PrefabInstance:
|
||||
- {fileID: -2433414600495825408, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 2589383517841344387, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 281343428}
|
||||
- targetCorrespondingSourceObject: {fileID: -8380213319930610923, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1619916422}
|
||||
@@ -18965,6 +19052,133 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3}
|
||||
--- !u!1 &1843195560
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1843195561}
|
||||
- component: {fileID: 1843195563}
|
||||
- component: {fileID: 1843195562}
|
||||
m_Layer: 0
|
||||
m_Name: Spot Light StainedGlass (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1843195561
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1843195560}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.10961535, y: -0, z: -0, w: 0.9939741}
|
||||
m_LocalPosition: {x: 0, y: 10.28, z: -14.56}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1182842639}
|
||||
m_LocalEulerAnglesHint: {x: -12.586, y: 0, z: 0}
|
||||
--- !u!114 &1843195562
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1843195560}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
|
||||
m_UsePipelineSettings: 1
|
||||
m_AdditionalLightsShadowResolutionTier: 2
|
||||
m_CustomShadowLayers: 0
|
||||
m_LightCookieSize: {x: 1, y: 1}
|
||||
m_LightCookieOffset: {x: 0, y: 0}
|
||||
m_SoftShadowQuality: 0
|
||||
m_RenderingLayersMask:
|
||||
serializedVersion: 0
|
||||
m_Bits: 1
|
||||
m_ShadowRenderingLayersMask:
|
||||
serializedVersion: 0
|
||||
m_Bits: 1
|
||||
m_Version: 4
|
||||
m_LightLayerMask: 1
|
||||
m_ShadowLayerMask: 1
|
||||
m_RenderingLayers: 1
|
||||
m_ShadowRenderingLayers: 1
|
||||
--- !u!108 &1843195563
|
||||
Light:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1843195560}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 12
|
||||
m_Type: 0
|
||||
m_Color: {r: 0.72156864, g: 0.7607843, b: 0.84313726, a: 1}
|
||||
m_Intensity: 200
|
||||
m_Range: 14.740949
|
||||
m_SpotAngle: 179
|
||||
m_InnerSpotAngle: 95.63957
|
||||
m_CookieSize2D: {x: 0.5, y: 0.5}
|
||||
m_Shadows:
|
||||
m_Type: 0
|
||||
m_Resolution: -1
|
||||
m_CustomResolution: -1
|
||||
m_Strength: 0.8
|
||||
m_Bias: 0.05
|
||||
m_NormalBias: 0.4
|
||||
m_NearPlane: 0.2
|
||||
m_CullingMatrixOverride:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_UseCullingMatrixOverride: 0
|
||||
m_Cookie: {fileID: 0}
|
||||
m_DrawHalo: 0
|
||||
m_Flare: {fileID: 0}
|
||||
m_RenderMode: 0
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingLayerMask: 1
|
||||
m_Lightmapping: 4
|
||||
m_LightShadowCasterMode: 0
|
||||
m_AreaSize: {x: 1, y: 1}
|
||||
m_BounceIntensity: 1
|
||||
m_ColorTemperature: 6570
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_UseViewFrustumForShadowCasterCull: 1
|
||||
m_ForceVisible: 0
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
m_LightUnit: 1
|
||||
m_LuxAtDistance: 1
|
||||
m_EnableSpotReflector: 1
|
||||
--- !u!4 &1847565686 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6629931168470329849, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
@@ -18981,7 +19195,6 @@ GameObject:
|
||||
- component: {fileID: 1857350192}
|
||||
- component: {fileID: 1857350193}
|
||||
- component: {fileID: 1857350194}
|
||||
- component: {fileID: 1857350195}
|
||||
m_Layer: 0
|
||||
m_Name: 'Trigger_HouseOfLeaves '
|
||||
m_TagString: Untagged
|
||||
@@ -19069,25 +19282,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Navigation.OctoSceneTrigger
|
||||
_sceneData: {fileID: 11400000, guid: 95381629b7e563a45b923c8eca96a142, type: 2}
|
||||
--- !u!114 &1857350195
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1857350191}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 358c75d041ea30a4ab85380893077e70, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Core.Events.GameEventTrigger
|
||||
_fireOnStart: 0
|
||||
_fireOnEnable: 0
|
||||
_delay: 0
|
||||
_fireOnlyOnce: 1
|
||||
_onTriggered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!64 &1871289640
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user