diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta index a6bf3a2..5d175a2 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 5651992cdad94894a3af7dc3f1da9170 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.13 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll + uploadId: 758278 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Any: enabled: 0 @@ -37,29 +47,11 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} PS4: enabled: 1 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} WebGL: - enabled: 1 - settings: {} - WiiU: - enabled: 1 + enabled: 0 settings: {} WindowsStoreApps: enabled: 1 @@ -77,10 +69,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.13 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll - uploadId: 758278 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta index aed83dc..342f4b6 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 5978f8f3dd274e848fbb7a123bde1fb9 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.13 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll + uploadId: 758278 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Any: enabled: 0 @@ -37,29 +47,11 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} PS4: enabled: 1 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} WebGL: - enabled: 1 - settings: {} - WiiU: - enabled: 1 + enabled: 0 settings: {} WindowsStoreApps: enabled: 1 @@ -77,10 +69,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.13 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll - uploadId: 758278 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta index 471f95d..f739063 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: d2a8f0021d6b47c5923d8972dfb81ef1 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.13 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll + uploadId: 758278 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Android: enabled: 1 @@ -40,33 +50,25 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} Linux64: enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} + settings: + CPU: OSXUniversal: enabled: 1 - settings: {} - PSM: - enabled: 0 + settings: + CPU: + WebGL: + enabled: 1 settings: {} Win: enabled: 1 - settings: {} + settings: + CPU: Win64: enabled: 1 - settings: {} + settings: + CPU: WindowsStoreApps: enabled: 0 settings: @@ -74,10 +76,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.13 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll - uploadId: 758278 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta index 4456431..ccccdd4 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 1e0a9643dc0d4b46bf2321f72c4e503e -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.13 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll + uploadId: 758278 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Android: enabled: 1 @@ -40,33 +50,25 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} Linux64: enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} + settings: + CPU: OSXUniversal: enabled: 1 - settings: {} - PSM: - enabled: 0 + settings: + CPU: + WebGL: + enabled: 1 settings: {} Win: enabled: 1 - settings: {} + settings: + CPU: Win64: enabled: 1 - settings: {} + settings: + CPU: WindowsStoreApps: enabled: 0 settings: @@ -74,10 +76,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.13 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll - uploadId: 758278 diff --git a/Assets/Scenes/menu.unity b/Assets/Scenes/menu.unity index be8f0d9..8036763 100644 --- a/Assets/Scenes/menu.unity +++ b/Assets/Scenes/menu.unity @@ -1096,7 +1096,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c900e12a827647ada2f645b798bfb13e, type: 3} m_Name: m_EditorClassIdentifier: - mainScene: {fileID: 102900000, guid: 9552b637a550584c597db3ec7cc2d716, type: 3} + mainScene: main exitButton: {fileID: 1086890493} --- !u!1 &1564397577 GameObject: diff --git a/Assets/Scenes/win.unity b/Assets/Scenes/win.unity index d365e3d..aba9349 100644 --- a/Assets/Scenes/win.unity +++ b/Assets/Scenes/win.unity @@ -1097,7 +1097,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c900e12a827647ada2f645b798bfb13e, type: 3} m_Name: m_EditorClassIdentifier: - mainScene: {fileID: 102900000, guid: 9552b637a550584c597db3ec7cc2d716, type: 3} + mainScene: main exitButton: {fileID: 1086890493} --- !u!1 &1564397577 GameObject: diff --git a/Assets/Scripts/Systems/GameManager.cs b/Assets/Scripts/Systems/GameManager.cs index 0b68038..f886849 100644 --- a/Assets/Scripts/Systems/GameManager.cs +++ b/Assets/Scripts/Systems/GameManager.cs @@ -72,7 +72,7 @@ namespace Systems yield return new WaitUntil(() => StoreIsClosed); } - SceneManager.LoadScene(winScene.name); + SceneManager.LoadScene("win"); } public void AddCoins(int amount) diff --git a/Assets/Scripts/UI/MainMenuUI.cs b/Assets/Scripts/UI/MainMenuUI.cs index 32a292e..cc9e2bc 100644 --- a/Assets/Scripts/UI/MainMenuUI.cs +++ b/Assets/Scripts/UI/MainMenuUI.cs @@ -8,7 +8,7 @@ namespace UI { public class MainMenuUI : MonoBehaviour { - [SerializeField] private Object mainScene; + [SerializeField] private String mainScene; [SerializeField] private Button exitButton; private void OnEnable() @@ -26,7 +26,7 @@ namespace UI public void StartGame() { - SceneManager.LoadScene(mainScene.name); + SceneManager.LoadScene(mainScene); } public void ExitGame() diff --git a/Assets/Settings/UniversalRP.asset b/Assets/Settings/UniversalRP.asset index fccfdda..ff5cc85 100644 --- a/Assets/Settings/UniversalRP.asset +++ b/Assets/Settings/UniversalRP.asset @@ -53,6 +53,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 2048 m_ReflectionProbeBlending: 0 m_ReflectionProbeBoxProjection: 0 + m_ReflectionProbeAtlas: 1 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 @@ -78,6 +79,7 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 0 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 @@ -98,35 +100,37 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeMainLightShadows: 4 m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index b807a23..65d40dc 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -62,7 +62,18 @@ MonoBehaviour: - rid: 7700004439546658820 - rid: 7700004439546658821 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 7752762179098771456 + - rid: 7752762179098771457 + - rid: 7752762179098771459 + - rid: 7752762179098771461 + - rid: 7752762179098771462 + - rid: 7752762179098771464 + - rid: 7752762179098771466 + - rid: 7752762179098771468 + - rid: 7752762179098771472 + - rid: 7752762179098771476 + - rid: 7700004439546658821 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fb7fe55..76333a6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -330,7 +330,13 @@ PlayerSettings: m_Height: 16 m_Kind: 0 m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: [] + m_BuildTargetBatching: + - m_BuildTarget: WebGL + m_StaticBatching: 0 + m_DynamicBatching: 0 + - m_BuildTarget: Standalone + m_StaticBatching: 1 + m_DynamicBatching: 0 m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobMode: [] @@ -619,6 +625,7 @@ PlayerSettings: webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 + WebGL: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: