diff --git a/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset b/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset index 1e5cdb0..8a2d63b 100644 --- a/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset +++ b/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0517c7201b6a73841950436abd2ee35f, type: 3} m_Name: CustomPostProcessingMaterials m_EditorClassIdentifier: - customEffect: {fileID: 2100000, guid: eee0d494252ff8b49a69d3b8e1b74894, type: 2} + customEffect: {fileID: 2100000, guid: a110daba21b580f4898ccf841727c0c2, type: 2} diff --git a/Assets/Prefabs/SHADER_VOLUME.prefab b/Assets/Resources/Shaders/SHADER_VOLUME.prefab similarity index 77% rename from Assets/Prefabs/SHADER_VOLUME.prefab rename to Assets/Resources/Shaders/SHADER_VOLUME.prefab index 8595257..afb3e2f 100644 --- a/Assets/Prefabs/SHADER_VOLUME.prefab +++ b/Assets/Resources/Shaders/SHADER_VOLUME.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 8571637250638348960} - component: {fileID: 8571637250638348961} + - component: {fileID: 7921335062534809054} m_Layer: 0 m_Name: SHADER_VOLUME m_TagString: Untagged @@ -49,3 +50,15 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: c3b45ae649e3364408bb0986304f0649, type: 2} +--- !u!114 &7921335062534809054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8571637250638348962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: caa0437e2cb72944799371bab89d8c31, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/SHADER_VOLUME.prefab.meta b/Assets/Resources/Shaders/SHADER_VOLUME.prefab.meta similarity index 100% rename from Assets/Prefabs/SHADER_VOLUME.prefab.meta rename to Assets/Resources/Shaders/SHADER_VOLUME.prefab.meta diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 712d77f..896a61c 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.15896621, g: 0.51753515, b: 1.0392404, a: 1} + m_IndirectSpecularColor: {r: 0.16007265, g: 0.5168968, b: 1.04459, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1043,7 +1043,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -3211,6 +3211,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb27366a77e9005428c263f8639ce0d9, type: 3} +--- !u!1001 &1118246944 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalPosition.x + value: 62.8 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.4 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348962, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_Name + value: SHADER_VOLUME + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7febab9e1a84fa449991f0126f4eccbc, type: 3} --- !u!4 &1119662119 stripped Transform: m_CorrespondingSourceObject: {fileID: 1164874563174981229, guid: eb27366a77e9005428c263f8639ce0d9, diff --git a/Assets/Scripts/DontDestroyOnLoad.cs b/Assets/Scripts/DontDestroyOnLoad.cs new file mode 100644 index 0000000..d6e6f03 --- /dev/null +++ b/Assets/Scripts/DontDestroyOnLoad.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +public class DontDestroyOnLoad : MonoBehaviour +{ + private void Awake() + { + DontDestroyOnLoad(this.gameObject); + } +} diff --git a/Assets/Scripts/DontDestroyOnLoad.cs.meta b/Assets/Scripts/DontDestroyOnLoad.cs.meta new file mode 100644 index 0000000..2affc69 --- /dev/null +++ b/Assets/Scripts/DontDestroyOnLoad.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: caa0437e2cb72944799371bab89d8c31 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index fb598de..f595653 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -52,7 +52,7 @@ public class MainMenu : MonoBehaviour private void Update() { - Debug.Log(Input.GetKeyDown(KeyCode.Escape)); + //Debug.Log(Input.GetKeyDown(KeyCode.Escape)); if (isCreditScrolling && Input.GetKeyDown(KeyCode.Escape)) { isCreditScrolling = false; diff --git a/Assets/Shaders/CRTMaterialShader.mat b/Assets/Shaders/CRTMaterialShader.mat index 2fb5137..6278217 100644 --- a/Assets/Shaders/CRTMaterialShader.mat +++ b/Assets/Shaders/CRTMaterialShader.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CRTMaterialShader - m_Shader: {fileID: 4800000, guid: d4c49b1ac4f8dd44d98d7885681c6d4d, type: 3} + m_Shader: {fileID: 4800000, guid: 7d830e9754227db4b89bacfdc753e135, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -118,24 +118,24 @@ Material: - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 - - u_bend: 4.03 + - u_bend: 4.47 - u_blue_offset_y: 0.0021 - u_green_offset_y: 0 - - u_noise_amount: 0.0154 - - u_noise_size: 417 + - u_noise_amount: 0.004 + - u_noise_size: 500 - u_red_offset_y: -0.0024 - - u_scanlin_transparence1: 0.005 - - u_scanlin_transparence2: 0.005 + - u_scanlin_transparence1: 0.001 + - u_scanlin_transparence2: 0.001 - u_scanline_amount: 0.143 - u_scanline_size_1: 277 - u_scanline_size_2: 521 - u_scanline_speed_1: 1569.4 - u_scanline_speed_2: 76.6 - - u_space_bend: 1.993 + - u_space_bend: 2.055 - u_time: 5.1 - - u_vignette_edge_round: 11.6 - - u_vignette_size: 1.95 - - u_vignette_smoothness: 0.82 + - u_vignette_edge_round: 58.5 + - u_vignette_size: 2 + - u_vignette_smoothness: 0.59 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Shaders/CRTShader.shader b/Assets/Shaders/CRTShader.shader index 791aab6..a2f7323 100644 --- a/Assets/Shaders/CRTShader.shader +++ b/Assets/Shaders/CRTShader.shader @@ -1,4 +1,4 @@ -Shader "CRTShaderFixed" +Shader "CRTShader" { Properties {