From 65bbc394b516b31c08319738d993053055a9a1cd Mon Sep 17 00:00:00 2001 From: in0finite Date: Wed, 24 Apr 2019 17:16:20 +0200 Subject: [PATCH] Resave Main scene --- Assets/Scenes/Main.unity | 263 +++++++++++++++++++++------------------ 1 file changed, 139 insertions(+), 124 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index eba519f7..300efa2a 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1430544495} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.496413, b: 0.5748156, a: 1} + m_IndirectSpecularColor: {r: 0.4465946, g: 0.49643135, b: 0.5748264, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 @@ -114,128 +113,133 @@ NavMeshSettings: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1001 &31119094 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} + - target: {fileID: 458624, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: f1fb24ea8c25e644cb89baa25b4a8bff, type: 3} --- !u!1001 &592530377 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 1273918895060814, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_LocalPosition.x value: 2106.089 objectReference: {fileID: 0} - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_LocalPosition.y value: 40 objectReference: {fileID: 0} - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_LocalPosition.z value: 1848.0103 objectReference: {fileID: 0} - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_LocalRotation.y value: 0.73046196 objectReference: {fileID: 0} - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_LocalRotation.w value: 0.6829534 objectReference: {fileID: 0} - - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} + - target: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} + - target: {fileID: 114099438993920694, guid: 9d45d42a7408c1e4ab325d6840364b84, + type: 3} + propertyPath: Camera + value: + objectReference: {fileID: 1117230323} - target: {fileID: 114173420020992462, guid: 9d45d42a7408c1e4ab325d6840364b84, - type: 2} + type: 3} propertyPath: m_doSmooth value: 0 objectReference: {fileID: 0} + - target: {fileID: 8031585062060932984, guid: 9d45d42a7408c1e4ab325d6840364b84, + type: 3} + propertyPath: m_SceneId + value: 2263395702 + objectReference: {fileID: 0} - target: {fileID: 20067565082138416, guid: 9d45d42a7408c1e4ab325d6840364b84, - type: 2} + type: 3} propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} - target: {fileID: 20067565082138416, guid: 9d45d42a7408c1e4ab325d6840364b84, - type: 2} + type: 3} propertyPath: field of view value: 60 objectReference: {fileID: 0} - - target: {fileID: 1273918895060814, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} - propertyPath: m_Layer - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 114099438993920694, guid: 9d45d42a7408c1e4ab325d6840364b84, - type: 2} - propertyPath: Camera - value: - objectReference: {fileID: 1117230323} m_RemovedComponents: - - {fileID: 114401842841139250, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} - - {fileID: 114828623362714814, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} - - {fileID: 114912848126749456, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} - - {fileID: 114741845841415948, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} - m_ParentPrefab: {fileID: 100100000, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 2} - m_IsPrefabParent: 0 + - {fileID: 114401842841139250, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} + - {fileID: 114828623362714814, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} + - {fileID: 114912848126749456, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} + - {fileID: 114741845841415948, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 9d45d42a7408c1e4ab325d6840364b84, type: 3} --- !u!4 &592530378 stripped Transform: - m_PrefabParentObject: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, - type: 2} - m_PrefabInternal: {fileID: 592530377} + m_CorrespondingSourceObject: {fileID: 4388436116821042, guid: 9d45d42a7408c1e4ab325d6840364b84, + type: 3} + m_PrefabInstance: {fileID: 592530377} + m_PrefabAsset: {fileID: 0} --- !u!1 &1117230320 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1117230324} - component: {fileID: 1117230323} @@ -252,27 +256,35 @@ GameObject: --- !u!81 &1117230321 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117230320} m_Enabled: 1 --- !u!124 &1117230322 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117230320} m_Enabled: 1 --- !u!20 &1117230323 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117230320} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -302,8 +314,9 @@ Camera: --- !u!4 &1117230324 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117230320} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 10.879656, y: -3.3310251, z: 54.095062} @@ -315,8 +328,9 @@ Transform: --- !u!114 &1117230325 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117230320} m_Enabled: 1 m_EditorHideFlags: 0 @@ -330,126 +344,127 @@ MonoBehaviour: zOffShader: {fileID: 4800000, guid: 12cb60961770c4d7e8cc1662ca101fec, type: 3} --- !u!108 &1430544495 stripped Light: - m_PrefabParentObject: {fileID: 10808534, guid: b6900baf9f552ba46ad27d4ada4d5489, - type: 2} - m_PrefabInternal: {fileID: 2088939132} + m_CorrespondingSourceObject: {fileID: 10808534, guid: b6900baf9f552ba46ad27d4ada4d5489, + type: 3} + m_PrefabInstance: {fileID: 2088939132} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1631170488 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 11400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} - propertyPath: textureSize - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 11400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} - propertyPath: waterMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} + - target: {fileID: 400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 11400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} + propertyPath: textureSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 11400000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} + propertyPath: waterMode + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 3} --- !u!1 &1631170489 stripped GameObject: - m_PrefabParentObject: {fileID: 100000, guid: 780611a67e8e941a2b3aa96e5915a793, type: 2} - m_PrefabInternal: {fileID: 1631170488} + m_CorrespondingSourceObject: {fileID: 100000, guid: 780611a67e8e941a2b3aa96e5915a793, + type: 3} + m_PrefabInstance: {fileID: 1631170488} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2088939132 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11436500, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} + - target: {fileID: 11436500, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} propertyPath: focusPoints.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11455068, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - propertyPath: WaterPrefab - value: - objectReference: {fileID: 1631170489} - - target: {fileID: 11436500, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} + - target: {fileID: 11436500, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} propertyPath: Focus value: objectReference: {fileID: 1117230324} - - target: {fileID: 11436500, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} + - target: {fileID: 11436500, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} propertyPath: focusPoints.Array.data[0] value: objectReference: {fileID: 592530378} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 499186, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11455068, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3} + propertyPath: WaterPrefab + value: + objectReference: {fileID: 1631170489} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: b6900baf9f552ba46ad27d4ada4d5489, type: 3}