From 3c5bc59e7ea87a8e1f0dbf8aaa0d94e4d4cb223f Mon Sep 17 00:00:00 2001 From: ultrakatiz <ultrakatiz@gmail.com> Date: Sun, 4 Aug 2019 21:02:05 +0200 Subject: [PATCH] prepare for merge --- ProjectSettings/EditorBuildSettings.asset | 6 +++--- ProjectSettings/GraphicsSettings.asset | 3 +++ ProjectSettings/UnityConnectSettings.asset | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index f4480fd..687d4e6 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,6 +8,9 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/SampleScene.unity guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 1 + path: Assets/Scenes/MainMenu.unity + guid: 3c61257c9f1ecde4ab9e5d16cf0f56de - enabled: 1 path: Assets/Scenes/Game.unity guid: a1633885aff01f04688aa4a949522219 @@ -17,9 +20,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Victory Scene.unity guid: 5d0264e8809cb394b920daf6f69bc09c - - enabled: 1 - path: Assets/Scenes/MainMenu.unity - guid: 3c61257c9f1ecde4ab9e5d16cf0f56de - enabled: 1 path: Assets/Scenes/Credits.unity guid: 390804f369176e048a38da574f370332 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 6c2632a..ab4d074 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -31,6 +31,9 @@ GraphicsSettings: m_AlwaysIncludedShaders: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index fa0b146..c3ae9a0 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events -- GitLab