From 6e922ede8e3f9bd3b095071cb1d73d0f0610c0cd Mon Sep 17 00:00:00 2001 From: Ant Date: Fri, 4 Dec 2020 12:41:05 +0100 Subject: [PATCH] Change pre-build --- Assets/Scenes/ObjectLevel 1.unity | 8 +- Assets/Scenes/ObjectLevel 2.unity | 8 +- Assets/Scenes/ObjectLevel 3.unity | 4 +- Assets/Scripts/Objects/Game.cs | 7 +- ProjectSettings/GraphicsSettings.asset | 233 +++++++++++++------------ ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/TimeManager.asset | 2 +- 7 files changed, 134 insertions(+), 130 deletions(-) diff --git a/Assets/Scenes/ObjectLevel 1.unity b/Assets/Scenes/ObjectLevel 1.unity index 8988f45..267464a 100644 --- a/Assets/Scenes/ObjectLevel 1.unity +++ b/Assets/Scenes/ObjectLevel 1.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,7 +99,7 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: 80ba78eaf06174489aeb85cfd033f2c5, type: 2} - m_LightingSettings: {fileID: 0} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} diff --git a/Assets/Scenes/ObjectLevel 2.unity b/Assets/Scenes/ObjectLevel 2.unity index 4294c0f..b5fcbcf 100644 --- a/Assets/Scenes/ObjectLevel 2.unity +++ b/Assets/Scenes/ObjectLevel 2.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,7 +99,7 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000004, guid: 80ba78eaf06174489aeb85cfd033f2c5, type: 2} - m_LightingSettings: {fileID: 0} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} diff --git a/Assets/Scenes/ObjectLevel 3.unity b/Assets/Scenes/ObjectLevel 3.unity index 3055da5..bbd42f0 100644 --- a/Assets/Scenes/ObjectLevel 3.unity +++ b/Assets/Scenes/ObjectLevel 3.unity @@ -5920,8 +5920,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699469064} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.04, z: -0.305} - m_LocalScale: {x: 0.16, y: 0.16, z: 0.16} + m_LocalPosition: {x: 0, y: 0.017, z: -0.305} + m_LocalScale: {x: 0.16, y: 0.1, z: 0.16} m_Children: [] m_Father: {fileID: 288900304} m_RootOrder: 0 diff --git a/Assets/Scripts/Objects/Game.cs b/Assets/Scripts/Objects/Game.cs index cc67ea3..667321c 100644 --- a/Assets/Scripts/Objects/Game.cs +++ b/Assets/Scripts/Objects/Game.cs @@ -192,7 +192,12 @@ void Update() { NewGame(); storage.Load(this); - } else + } + else if (Input.GetKeyDown(KeyCode.Escape)) + { + Application.Quit(); + } + else { for (int i = 1; i <= levelCount; i++) { diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index ff6202c..8e36aca 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,115 +1,118 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!30 &1 -GraphicsSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_Deferred: - m_Mode: 1 - m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} - m_ScreenSpaceShadows: - m_Mode: 1 - m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} - m_DepthNormals: - m_Mode: 1 - m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} - m_MotionVectors: - m_Mode: 1 - m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} - m_LightHalo: - m_Mode: 1 - m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} - m_LensFlare: - m_Mode: 1 - m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 0} - m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} - m_DefaultRenderingPath: 1 - m_DefaultMobileRenderingPath: 1 - m_TierSettings: - - serializedVersion: 5 - m_BuildTarget: 1 - m_Tier: 0 - m_Settings: - standardShaderQuality: 2 - renderingPath: 3 - hdrMode: 1 - realtimeGICPUUsage: 25 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - useHDR: 1 - useDetailNormalMap: 1 - useCascadedShadowMaps: 1 - prefer32BitShadowMaps: 0 - enableLPPV: 1 - useDitherMaskForAlphaBlendedShadows: 1 - m_Automatic: 0 - - serializedVersion: 5 - m_BuildTarget: 1 - m_Tier: 1 - m_Settings: - standardShaderQuality: 2 - renderingPath: 3 - hdrMode: 1 - realtimeGICPUUsage: 25 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - useHDR: 1 - useDetailNormalMap: 1 - useCascadedShadowMaps: 1 - prefer32BitShadowMaps: 0 - enableLPPV: 1 - useDitherMaskForAlphaBlendedShadows: 1 - m_Automatic: 0 - - serializedVersion: 5 - m_BuildTarget: 1 - m_Tier: 2 - m_Settings: - standardShaderQuality: 2 - renderingPath: 3 - hdrMode: 1 - realtimeGICPUUsage: 50 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - useHDR: 1 - useDetailNormalMap: 1 - useCascadedShadowMaps: 1 - prefer32BitShadowMaps: 0 - enableLPPV: 1 - useDitherMaskForAlphaBlendedShadows: 1 - m_Automatic: 0 - m_LightmapStripping: 0 - m_FogStripping: 0 - m_InstancingStripping: 0 - m_LightmapKeepPlain: 1 - m_LightmapKeepDirCombined: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepShadowMask: 1 - m_LightmapKeepSubtractive: 1 - m_FogKeepLinear: 1 - m_FogKeepExp: 1 - m_FogKeepExp2: 1 - m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 0 + m_Settings: + standardShaderQuality: 2 + renderingPath: 3 + hdrMode: 1 + realtimeGICPUUsage: 25 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 + useHDR: 1 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 + prefer32BitShadowMaps: 0 + enableLPPV: 1 + useDitherMaskForAlphaBlendedShadows: 1 + m_Automatic: 0 + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 1 + m_Settings: + standardShaderQuality: 2 + renderingPath: 3 + hdrMode: 1 + realtimeGICPUUsage: 25 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 + useHDR: 1 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 + prefer32BitShadowMaps: 0 + enableLPPV: 1 + useDitherMaskForAlphaBlendedShadows: 1 + m_Automatic: 0 + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 2 + m_Settings: + standardShaderQuality: 2 + renderingPath: 3 + hdrMode: 1 + realtimeGICPUUsage: 50 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 + useHDR: 1 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 + prefer32BitShadowMaps: 0 + enableLPPV: 1 + useDitherMaskForAlphaBlendedShadows: 1 + m_Automatic: 0 + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ea036e6..c6f552d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany - productName: New Unity Project + productName: Lego defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 6eebdb3..25e4370 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -3,7 +3,7 @@ --- !u!5 &1 TimeManager: m_ObjectHideFlags: 0 - Fixed Timestep: 0.05 + Fixed Timestep: 0.02 Maximum Allowed Timestep: 0.5 m_TimeScale: 1 Maximum Particle Timestep: 0.05