diff --git a/Assets/BlenderModels/SmallWindowWall.blend b/Assets/BlenderModels/SmallWindowWall.blend index 52ca176b..0e7caea1 100644 Binary files a/Assets/BlenderModels/SmallWindowWall.blend and b/Assets/BlenderModels/SmallWindowWall.blend differ diff --git a/Assets/BlenderModels/SmallWindowWall.blend1 b/Assets/BlenderModels/SmallWindowWall.blend1 index 1c4d42f8..52ca176b 100644 Binary files a/Assets/BlenderModels/SmallWindowWall.blend1 and b/Assets/BlenderModels/SmallWindowWall.blend1 differ diff --git a/Assets/Models/Interrior/SmallWindowWall.fbx b/Assets/Models/Interrior/SmallWindowWall.fbx index c7434c29..438c333f 100644 Binary files a/Assets/Models/Interrior/SmallWindowWall.fbx and b/Assets/Models/Interrior/SmallWindowWall.fbx differ diff --git a/Assets/Scenes/City.unity b/Assets/Scenes/City.unity index 8dedca65..80fb8207 100644 --- a/Assets/Scenes/City.unity +++ b/Assets/Scenes/City.unity @@ -4128,7 +4128,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749553635} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4728,7 +4728,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835327588} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Scenes/School.unity b/Assets/Scenes/School.unity index 85be7d16..55b5499f 100644 --- a/Assets/Scenes/School.unity +++ b/Assets/Scenes/School.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.12731725, g: 0.13414745, b: 0.12107873, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -93,7 +93,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: b3da5416f246cec49995987bfcf5181c, + type: 2} m_LightingSettings: {fileID: 1709286000} --- !u!196 &4 NavMeshSettings: @@ -188,6 +189,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (37) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -262,6 +268,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (31) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -340,8 +351,8 @@ Light: serializedVersion: 11 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 15 - m_Range: 5 + m_Intensity: 10 + m_Range: 4 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -379,7 +390,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -458,6 +469,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (1) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -537,6 +553,11 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -664,6 +685,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (29) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -738,6 +764,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (15) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -818,6 +849,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (35) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -950,7 +986,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &548336941 Transform: @@ -1064,6 +1100,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (20) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1143,6 +1184,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1222,6 +1268,11 @@ PrefabInstance: propertyPath: m_Name value: SmallWindowWall objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 780942ce2a0781847a785cc2a6542524, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1301,6 +1352,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (6) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1389,7 +1445,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, type: 3} propertyPath: m_StaticEditorFlags - value: 0 + value: 2147483647 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1465,6 +1521,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (27) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1545,6 +1606,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (39) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1619,6 +1685,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (24) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1693,6 +1764,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (28) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1737,6 +1813,7 @@ Transform: - {fileID: 1857883146} - {fileID: 904172956} - {fileID: 80363961} + - {fileID: 1575061565} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &904172955 @@ -1806,8 +1883,8 @@ Light: serializedVersion: 11 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 15 - m_Range: 5 + m_Intensity: 10 + m_Range: 4 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -1845,7 +1922,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -1919,6 +1996,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (22) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1993,6 +2075,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (14) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2018,7 +2105,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &966157588 Transform: @@ -2143,6 +2230,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (2) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2223,6 +2315,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (38) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2312,6 +2409,11 @@ PrefabInstance: propertyPath: m_TagString value: Untagged objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f85c42ebe35945e4986cba3418681f3e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2337,7 +2439,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1086470460 Transform: @@ -2417,6 +2519,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (26) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2491,6 +2598,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (12) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2565,6 +2677,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (34) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2639,6 +2756,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (11) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2713,6 +2835,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (33) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2792,6 +2919,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (8) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2866,6 +2998,11 @@ PrefabInstance: propertyPath: m_Name value: SmallWindowWall (1) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 780942ce2a0781847a785cc2a6542524, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2940,6 +3077,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (10) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3019,6 +3161,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (5) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3093,6 +3240,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (25) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3172,6 +3324,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (3) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3246,6 +3403,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (30) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3257,6 +3419,56 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1531253369} m_PrefabAsset: {fileID: 0} +--- !u!1 &1575061564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575061565} + - component: {fileID: 1575061566} + m_Layer: 0 + m_Name: Light Probe Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1575061565 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575061564} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.06, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 819075070} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!220 &1575061566 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575061564} + m_Enabled: 1 + m_SourcePositions: + - {x: 4.5980234, y: 1, z: 4.6840954} + - {x: 4.5980234, y: 1, z: -2.804342} + - {x: 4.5980234, y: -1, z: 4.6840954} + - {x: 4.5980234, y: -1, z: -2.804342} + - {x: -5.291945, y: 1, z: 4.985257} + - {x: -4.616657, y: 1, z: -2.902548} + - {x: -5.291945, y: -1, z: 4.985257} + - {x: -4.616657, y: -1, z: -2.902548} + m_Dering: 1 --- !u!1001 &1593699102 PrefabInstance: m_ObjectHideFlags: 0 @@ -3320,6 +3532,11 @@ PrefabInstance: propertyPath: m_Name value: SmallWindowWall (3) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 780942ce2a0781847a785cc2a6542524, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3400,6 +3617,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (42) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3474,6 +3696,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (18) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3499,7 +3726,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1692327319 Transform: @@ -3538,7 +3765,7 @@ LightingSettings: m_BakeResolution: 40 m_Padding: 2 m_LightmapCompression: 3 - m_AO: 0 + m_AO: 1 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 @@ -3639,6 +3866,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (32) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3719,6 +3951,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (43) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3797,13 +4034,13 @@ Light: serializedVersion: 11 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 15 - m_Range: 5 + m_Intensity: 10 + m_Range: 4 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -3836,7 +4073,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -3864,7 +4101,7 @@ GameObject: m_TagString: Respawn m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1870255492 Transform: @@ -4002,6 +4239,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (44) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4076,6 +4318,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (9) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4155,6 +4402,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (7) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4235,6 +4487,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (36) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4313,13 +4570,13 @@ Light: serializedVersion: 11 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 15 + m_Intensity: 10 m_Range: 5 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -4352,7 +4609,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -4494,6 +4751,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (4) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4568,6 +4830,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (13) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4642,6 +4909,11 @@ PrefabInstance: propertyPath: m_Name value: FlatWall (16) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4716,6 +4988,11 @@ PrefabInstance: propertyPath: m_Name value: SmallWindowWall (2) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 780942ce2a0781847a785cc2a6542524, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4763,7 +5040,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &3190114108151602942 Transform: @@ -4850,7 +5127,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &5901357866206077163 BoxCollider: diff --git a/Assets/Scenes/School/LightingData.asset b/Assets/Scenes/School/LightingData.asset new file mode 100644 index 00000000..123412d6 Binary files /dev/null and b/Assets/Scenes/School/LightingData.asset differ diff --git a/Assets/Scenes/School/LightingData.asset.meta b/Assets/Scenes/School/LightingData.asset.meta new file mode 100644 index 00000000..b22d9a9a --- /dev/null +++ b/Assets/Scenes/School/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3da5416f246cec49995987bfcf5181c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/School/Lightmap-0_comp_dir.png b/Assets/Scenes/School/Lightmap-0_comp_dir.png new file mode 100644 index 00000000..51f4bec4 Binary files /dev/null and b/Assets/Scenes/School/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/School/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/School/Lightmap-0_comp_dir.png.meta new file mode 100644 index 00000000..da4ead75 --- /dev/null +++ b/Assets/Scenes/School/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 48f3bcfca5add794f9ac40fccea7700d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/School/Lightmap-0_comp_light.exr b/Assets/Scenes/School/Lightmap-0_comp_light.exr new file mode 100644 index 00000000..e8616c9a Binary files /dev/null and b/Assets/Scenes/School/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/School/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/School/Lightmap-0_comp_light.exr.meta new file mode 100644 index 00000000..8ea1e950 --- /dev/null +++ b/Assets/Scenes/School/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 77bfe0c45416be54ab230d8f4a487f45 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/School/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/School/Lightmap-0_comp_shadowmask.png new file mode 100644 index 00000000..5c9dfddd Binary files /dev/null and b/Assets/Scenes/School/Lightmap-0_comp_shadowmask.png differ diff --git a/Assets/Scenes/School/Lightmap-0_comp_shadowmask.png.meta b/Assets/Scenes/School/Lightmap-0_comp_shadowmask.png.meta new file mode 100644 index 00000000..b5c3871b --- /dev/null +++ b/Assets/Scenes/School/Lightmap-0_comp_shadowmask.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 9481c58dde3970540ae60918da527a2f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 11 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/School/ReflectionProbe-0.exr b/Assets/Scenes/School/ReflectionProbe-0.exr new file mode 100644 index 00000000..59952651 Binary files /dev/null and b/Assets/Scenes/School/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/School/ReflectionProbe-0.exr.meta b/Assets/Scenes/School/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000..0446180e --- /dev/null +++ b/Assets/Scenes/School/ReflectionProbe-0.exr.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 453a47c3b4ed0ee438414b621eddbc51 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: