From 174d50aaf61fd689e9b9e6ef0c79d66189e9cc33 Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Thu, 21 Mar 2019 18:13:24 +1100 Subject: [PATCH] - not sure what i did, end of thursday class commit :) --- Assets/Scenes/TuteLevelFive.unity | 8 +++---- Assets/Scenes/TuteLevelOne.unity | 29 +++++++++++++++++++---- ProjectSettings/EditorBuildSettings.asset | 4 ++-- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Assets/Scenes/TuteLevelFive.unity b/Assets/Scenes/TuteLevelFive.unity index 277298d..ea0675f 100644 --- a/Assets/Scenes/TuteLevelFive.unity +++ b/Assets/Scenes/TuteLevelFive.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1515,12 +1515,12 @@ PrefabInstance: - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: nextScene - value: TuteLevelOne + value: Start Menu objectReference: {fileID: 0} - target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1116712125457233699, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} @@ -3493,7 +3493,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1510348215} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3} m_Name: diff --git a/Assets/Scenes/TuteLevelOne.unity b/Assets/Scenes/TuteLevelOne.unity index c6ac397..76c5512 100644 --- a/Assets/Scenes/TuteLevelOne.unity +++ b/Assets/Scenes/TuteLevelOne.unity @@ -386,7 +386,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0, y: 55} + m_AnchoredPosition: {x: 0, y: 55} m_SizeDelta: {x: 575, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &306425856 @@ -1292,7 +1292,7 @@ PrefabInstance: - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} @@ -1512,7 +1512,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1496531310 Transform: m_ObjectHideFlags: 0 @@ -2101,7 +2101,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 1208531385} - m_PlaneDistance: 100 + m_PlaneDistance: 75 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -2145,7 +2145,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1595022036237380, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4857846807085456, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} propertyPath: m_LocalPosition.x @@ -2191,6 +2191,25 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1247869959898408, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 198402580061111426, guid: afd6305e706fd444eaeb68953a8475e9, + type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.05882353 + objectReference: {fileID: 0} + - target: {fileID: 198402580061111426, guid: afd6305e706fd444eaeb68953a8475e9, + type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.8509804 + objectReference: {fileID: 0} + - target: {fileID: 198402580061111426, guid: afd6305e706fd444eaeb68953a8475e9, + type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.92156863 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} --- !u!1001 &2098077299 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 79f56fc..c0abd3c 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb477513ef8e072efb8d5b9158dfe75452e5d5bd2f3f1b7dce022aadfd59690 -size 735 +oid sha256:f502d89a545cece9b62c1c0c379cded0dbabcb8055d896596eba7fa10a276d1e +size 834