diff --git a/Assets/Materials/ShinyUnderTent.mat b/Assets/Materials/ShinyUnderTent.mat index 197dcb2..789fd10 100644 --- a/Assets/Materials/ShinyUnderTent.mat +++ b/Assets/Materials/ShinyUnderTent.mat @@ -74,4 +74,4 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0.28382537, g: 0.27936736, b: 0.01783196, a: 1} + - _EmissionColor: {r: 0, g: 0.103773594, b: 0, a: 1} diff --git a/Assets/Materials/Tent.mat b/Assets/Materials/Tent.mat index c4cd495..be75a9a 100644 --- a/Assets/Materials/Tent.mat +++ b/Assets/Materials/Tent.mat @@ -9,8 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Tent m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -74,4 +74,4 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 0.10522568, g: 0.2264151, b: 0.06941973, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.027729679, g: 0.08873497, b: 0.030502645, a: 1} diff --git a/Assets/Prefabs/Environment/DeadTree.prefab b/Assets/Prefabs/Environment/DeadTree.prefab index 8240d33..ea56f7e 100644 --- a/Assets/Prefabs/Environment/DeadTree.prefab +++ b/Assets/Prefabs/Environment/DeadTree.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6146008682649884421} + - component: {fileID: -649907758206895049} m_Layer: 0 m_Name: DeadTree m_TagString: Untagged @@ -31,6 +32,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-649907758206895049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3828898392337730748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 049498ca6910d2d4d915c7a47791a4dc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5491765641430381139 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/LefaTree.prefab b/Assets/Prefabs/Environment/LefaTree.prefab index 104c83c..b77d8dd 100644 --- a/Assets/Prefabs/Environment/LefaTree.prefab +++ b/Assets/Prefabs/Environment/LefaTree.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1416060363081332451} + - component: {fileID: 4864167641988283359} m_Layer: 0 m_Name: LefaTree m_TagString: Untagged @@ -31,6 +32,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4864167641988283359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700814859666117554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 049498ca6910d2d4d915c7a47791a4dc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5323890504769059336 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/PineTree.prefab b/Assets/Prefabs/Environment/PineTree.prefab index 220eebd..05aa3eb 100644 --- a/Assets/Prefabs/Environment/PineTree.prefab +++ b/Assets/Prefabs/Environment/PineTree.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5327936629455661424} + - component: {fileID: -4627941334550427029} m_Layer: 0 m_Name: PineTree m_TagString: Untagged @@ -31,6 +32,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-4627941334550427029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2469457951508719009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 049498ca6910d2d4d915c7a47791a4dc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2749315332302543984 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 4b5f99a..2f0c03c 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -214,7 +214,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &71220341 Transform: @@ -333,7 +333,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &237467733 GameObject: @@ -346,11 +346,11 @@ GameObject: - component: {fileID: 237467734} - component: {fileID: 237467735} m_Layer: 0 - m_Name: Directional Light + m_Name: Moon Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &237467734 Transform: @@ -387,7 +387,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.5 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -427,6 +427,75 @@ Light: m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1001 &311702584 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2469457951508719009, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_Name + value: PineTree + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalPosition.x + value: 13.882904 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalPosition.z + value: 11.874908 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46e8ab3179fc53841920eb9ab6986b24, type: 3} --- !u!1001 &397359278 PrefabInstance: m_ObjectHideFlags: 0 @@ -1878,7 +1947,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &1445458448 Transform: @@ -1941,6 +2010,70 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445458447} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1467350794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1467350795} + - component: {fileID: 1467350796} + m_Layer: 0 + m_Name: Reflection Probe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1467350795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467350794} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.22, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1660514110} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!215 &1467350796 +ReflectionProbe: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467350794} + m_Enabled: 1 + serializedVersion: 2 + m_Type: 0 + m_Mode: 1 + m_RefreshMode: 0 + m_TimeSlicingMode: 0 + m_Resolution: 128 + m_UpdateFrequency: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxOffset: {x: 0, y: 0, z: 0} + m_NearClip: 0.3 + m_FarClip: 1000 + m_ShadowDistance: 100 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_IntensityMultiplier: 1 + m_BlendDistance: 1 + m_HDR: 1 + m_BoxProjection: 1 + m_RenderDynamicObjects: 0 + m_UseOcclusionCulling: 1 + m_Importance: 1 + m_CustomBakedTexture: {fileID: 0} --- !u!1001 &1475581714 PrefabInstance: m_ObjectHideFlags: 0 @@ -2016,6 +2149,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1475581714} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1487796365 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalPosition.x + value: 14.694244 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.000122 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.8123627 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6700814859666117554, guid: 410d196d969ed404a883c67749ad3170, + type: 3} + propertyPath: m_Name + value: LefaTree + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 410d196d969ed404a883c67749ad3170, type: 3} --- !u!1001 &1512016787 PrefabInstance: m_ObjectHideFlags: 0 @@ -2148,7 +2350,7 @@ PrefabInstance: - target: {fileID: 4797807552203538256, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_StaticEditorFlags - value: 4294967295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} @@ -2286,8 +2488,9 @@ Transform: - {fileID: 1639218800} - {fileID: 1533351108} - {fileID: 1694329891} + - {fileID: 1467350795} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1694329890 GameObject: @@ -2746,13 +2949,82 @@ RectTransform: - {fileID: 1156509021} - {fileID: 429180126} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &1932969144 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3828898392337730748, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_Name + value: DeadTree + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalPosition.x + value: 9.048676 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.5434723 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b6ff003e05b42fb4e9319ea8bb82d882, type: 3} --- !u!1 &2038862783 GameObject: m_ObjectHideFlags: 0 @@ -3104,7 +3376,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &531861614376686525 PrefabInstance: diff --git a/Assets/Scenes/MainScene/LightingData.asset b/Assets/Scenes/MainScene/LightingData.asset index 1ac08be..a73b0fe 100644 Binary files a/Assets/Scenes/MainScene/LightingData.asset and b/Assets/Scenes/MainScene/LightingData.asset differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png index 99fddc0..5b535bc 100644 Binary files a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png and b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr index 05b9b32..fa6ef6d 100644 Binary files a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr and b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png index 41d04e8..02082d8 100644 Binary files a/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png and b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png differ diff --git a/Assets/Scenes/MainScene/ReflectionProbe-0.exr b/Assets/Scenes/MainScene/ReflectionProbe-0.exr index 70df441..a537136 100644 Binary files a/Assets/Scenes/MainScene/ReflectionProbe-0.exr and b/Assets/Scenes/MainScene/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/MainScene/ReflectionProbe-1.exr b/Assets/Scenes/MainScene/ReflectionProbe-1.exr new file mode 100644 index 0000000..70df441 Binary files /dev/null and b/Assets/Scenes/MainScene/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/MainScene/ReflectionProbe-1.exr.meta b/Assets/Scenes/MainScene/ReflectionProbe-1.exr.meta new file mode 100644 index 0000000..23883b7 --- /dev/null +++ b/Assets/Scenes/MainScene/ReflectionProbe-1.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 2c836a0e69fba50479860aaba54951f0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset b/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset index d79e47d..44ab82e 100644 --- a/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset +++ b/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset @@ -214,7 +214,7 @@ MonoBehaviour: value: 100 lift: overrideState: 1 - value: {x: 1, y: 1, z: 1, w: 0.000000080226975} + value: {x: 1, y: 1, z: 1, w: -0.046656296} gamma: overrideState: 1 value: {x: 1, y: 1, z: 1, w: -8.647041e-10} diff --git a/Assets/Scripts/GameState.cs b/Assets/Scripts/GameState.cs index 853a892..991ef90 100644 --- a/Assets/Scripts/GameState.cs +++ b/Assets/Scripts/GameState.cs @@ -22,6 +22,6 @@ public class GameState : MonoBehaviour { } } - Time.timeScale = Mathf.Lerp(Time.timeScale, Current == State.Paused ? 0 : 1, 10f * Time.unscaledDeltaTime); + Time.timeScale = Mathf.Lerp(Time.timeScale, Current == State.Paused ? 0 : 1, 6f * Time.unscaledDeltaTime); } }