From 31ad6bef1c4d985a72c71a988d30967677977683 Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Wed, 27 Mar 2019 12:40:20 +1100 Subject: [PATCH] - Adjust camera position in 6 new scenes --- Assets/Scenes/ChickenRunOne.unity | 8 +-- Assets/Scenes/ChickenRunTwo.unity | 18 +++---- Assets/Scenes/ColourCollideOne.unity | 6 +-- Assets/Scenes/ColourCollideThree.unity | 73 +++++++++++++++++++++++++- Assets/Scenes/ColourCollideTwo.unity | 73 +++++++++++++++++++++++++- Assets/Scenes/MainMenu.unity | 16 +++--- Assets/Scenes/ReCompileRaceOne.unity | 44 ++++++++-------- Assets/Scenes/TuteLevelFive.unity | 32 +++++------ Assets/Scripts/MainMenuController.cs | 33 ++++++------ 9 files changed, 221 insertions(+), 82 deletions(-) diff --git a/Assets/Scenes/ChickenRunOne.unity b/Assets/Scenes/ChickenRunOne.unity index f85f0ff..396c85f 100644 --- a/Assets/Scenes/ChickenRunOne.unity +++ b/Assets/Scenes/ChickenRunOne.unity @@ -1406,13 +1406,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267130382} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: 0.33591917, y: -0.2659446, z: 0.09947492, w: 0.89807385} + m_LocalPosition: {x: 11.22, y: 6.89, z: -7.03} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 41.016003, y: -32.991, z: 0} --- !u!1001 &268562837 PrefabInstance: m_ObjectHideFlags: 0 @@ -5611,7 +5611,7 @@ PrefabInstance: - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} diff --git a/Assets/Scenes/ChickenRunTwo.unity b/Assets/Scenes/ChickenRunTwo.unity index 930b70c..0b94209 100644 --- a/Assets/Scenes/ChickenRunTwo.unity +++ b/Assets/Scenes/ChickenRunTwo.unity @@ -461,7 +461,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 + far clip plane: 100 field of view: 60 orthographic: 0 orthographic size: 5 @@ -487,13 +487,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 36343784} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: 0.47756162, y: 0.014509012, z: -0.0005973057, w: 0.8784783} + m_LocalPosition: {x: 11.7, y: 15.87, z: -10.43} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 57.042004, y: 2.6260002, z: 1.3490001} --- !u!1001 &59740338 PrefabInstance: m_ObjectHideFlags: 0 @@ -7126,23 +7126,25 @@ Transform: - {fileID: 2118607725} - {fileID: 67642929} - {fileID: 2036253531} + - {fileID: 532599790} - {fileID: 702312987} - {fileID: 1449012242} - {fileID: 1442466695} - {fileID: 681245365} + - {fileID: 2069768989} + - {fileID: 2078733980} - {fileID: 290616985} - {fileID: 1130758051} - {fileID: 1980654316} - {fileID: 422943739} - {fileID: 668234433} - {fileID: 1294305448} - - {fileID: 532599790} + - {fileID: 186239603} + - {fileID: 2072328808} - {fileID: 2122996539} - {fileID: 1570262924} - - {fileID: 2069768989} - {fileID: 1143274076} - {fileID: 1927191939} - - {fileID: 2078733980} - {fileID: 307247770} - {fileID: 1583469027} - {fileID: 1731362625} @@ -7150,9 +7152,7 @@ Transform: - {fileID: 739920458} - {fileID: 82306958} - {fileID: 1592082494} - - {fileID: 186239603} - {fileID: 1523421386} - - {fileID: 2072328808} - {fileID: 153783561} - {fileID: 23113039} - {fileID: 2084845000} diff --git a/Assets/Scenes/ColourCollideOne.unity b/Assets/Scenes/ColourCollideOne.unity index d50b0c9..6ef5f16 100644 --- a/Assets/Scenes/ColourCollideOne.unity +++ b/Assets/Scenes/ColourCollideOne.unity @@ -4788,13 +4788,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 503751890} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2, y: 1, z: -10} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 4.98, y: 18.19, z: -3.2} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1001 &509569171 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ColourCollideThree.unity b/Assets/Scenes/ColourCollideThree.unity index 848497c..1f22e34 100644 --- a/Assets/Scenes/ColourCollideThree.unity +++ b/Assets/Scenes/ColourCollideThree.unity @@ -12514,6 +12514,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 936409321} m_PrefabAsset: {fileID: 0} +--- !u!1001 &940333422 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_Name + value: Character + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalPosition.y + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalPosition.z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} --- !u!1001 &945989469 PrefabInstance: m_ObjectHideFlags: 0 @@ -20813,7 +20882,7 @@ Transform: - {fileID: 1076693677} - {fileID: 1940789020} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1550056932 PrefabInstance: @@ -25292,7 +25361,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &1869977603 PrefabInstance: diff --git a/Assets/Scenes/ColourCollideTwo.unity b/Assets/Scenes/ColourCollideTwo.unity index 0b94fc8..cbbb2aa 100644 --- a/Assets/Scenes/ColourCollideTwo.unity +++ b/Assets/Scenes/ColourCollideTwo.unity @@ -1125,7 +1125,7 @@ Transform: - {fileID: 225877334} - {fileID: 1858144926} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &128107608 PrefabInstance: @@ -11329,6 +11329,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1566569506} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1598563863 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_Name + value: Character + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalPosition.y + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalPosition.z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} --- !u!1001 &1611079938 PrefabInstance: m_ObjectHideFlags: 0 @@ -12276,7 +12345,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &1725069076 PrefabInstance: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 73020e7..4e712e4 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1339,7 +1339,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 95 + m_PlaneDistance: 10 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -1657,7 +1657,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 95 + m_PlaneDistance: 10 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -3515,7 +3515,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 95 + m_PlaneDistance: 10 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -3772,10 +3772,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2708d630b8dffe849986ea6fcc82efee, type: 3} m_Name: m_EditorClassIdentifier: - GameOptionsMenu: {fileID: 532262372} - SettingsMenu: {fileID: 1537787426} - MainMenu: {fileID: 2128700974} - HowToPlayMenu: {fileID: 0} + GameOptionsMenu: {fileID: 532262369} + SettingsMenu: {fileID: 1537787424} + MainMenu: {fileID: 2128700971} + HowToPlayMenu: {fileID: 641788366} SoundButton: {fileID: 477405345} MusicButton: {fileID: 1107977225} --- !u!1 &1665362270 @@ -4753,7 +4753,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 95 + m_PlaneDistance: 10 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 diff --git a/Assets/Scenes/ReCompileRaceOne.unity b/Assets/Scenes/ReCompileRaceOne.unity index 82b3fe9..ba8d4b1 100644 --- a/Assets/Scenes/ReCompileRaceOne.unity +++ b/Assets/Scenes/ReCompileRaceOne.unity @@ -1735,8 +1735,8 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 - far clip plane: 1000 + near clip plane: 0.01 + far clip plane: 100 field of view: 60 orthographic: 0 orthographic size: 5 @@ -1762,13 +1762,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 183403477} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: 0.2247715, y: -0.08707044, z: 0.022977613, w: 0.97024155} + m_LocalPosition: {x: 12.75, y: 5.85, z: -11.86} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 26.115002, y: -10.176001, z: 0.347} --- !u!1001 &185687866 PrefabInstance: m_ObjectHideFlags: 0 @@ -11599,60 +11599,59 @@ Transform: - {fileID: 258763636} - {fileID: 146968995} - {fileID: 1764016245} - - {fileID: 535012351} - {fileID: 1510784276} - {fileID: 81554160} - {fileID: 2117424317} - {fileID: 155441101} - {fileID: 470886817} + - {fileID: 89843453} - {fileID: 42870165} - - {fileID: 1414542900} + - {fileID: 535012351} - {fileID: 609080729} + - {fileID: 1414542900} - {fileID: 345406146} - {fileID: 945080442} - {fileID: 295939104} - - {fileID: 1743010282} - - {fileID: 89843453} - {fileID: 844596468} - {fileID: 11426401} - {fileID: 1119624907} - {fileID: 1858509858} - {fileID: 1938792170} + - {fileID: 1743010282} + - {fileID: 666486492} - {fileID: 870840311} - {fileID: 753243853} - - {fileID: 666486492} - - {fileID: 962363708} + - {fileID: 807615367} - {fileID: 545137879} + - {fileID: 406533969} - {fileID: 87841985} - - {fileID: 807615367} - - {fileID: 1515881667} - - {fileID: 978333468} - {fileID: 1485105230} - {fileID: 1902553322} + - {fileID: 962363708} - {fileID: 840167675} - {fileID: 1418402642} - {fileID: 1955136737} + - {fileID: 978333468} - {fileID: 607262977} - {fileID: 1392193444} - {fileID: 2066869218} - {fileID: 1378903081} - {fileID: 1582374519} + - {fileID: 1515881667} - {fileID: 256123217} - - {fileID: 1051372838} - - {fileID: 1716709629} - {fileID: 815015474} + - {fileID: 540857998} - {fileID: 117623892} - - {fileID: 406533969} + - {fileID: 1716709629} - {fileID: 1374931947} - - {fileID: 540857998} - - {fileID: 1852218519} - - {fileID: 1035911848} - {fileID: 4129892} - {fileID: 764913721} - {fileID: 700067813} + - {fileID: 1051372838} - {fileID: 127104763} - {fileID: 2048600224} - {fileID: 391011299} + - {fileID: 1035911848} - {fileID: 408093104} - {fileID: 72914425} - {fileID: 1233650081} @@ -11664,6 +11663,7 @@ Transform: - {fileID: 2043193412} - {fileID: 2086255650} - {fileID: 981556201} + - {fileID: 1852218519} - {fileID: 844703588} - {fileID: 214132442} - {fileID: 1437365904} @@ -11696,7 +11696,6 @@ Transform: - {fileID: 1029496178} - {fileID: 1148195923} - {fileID: 1688728019} - - {fileID: 1052230106} - {fileID: 626145457} - {fileID: 1079393432} - {fileID: 1303539471} @@ -11705,6 +11704,7 @@ Transform: - {fileID: 517882325} - {fileID: 2051175056} - {fileID: 2071254466} + - {fileID: 1052230106} - {fileID: 325746672} - {fileID: 664959906} - {fileID: 1714957685} @@ -11744,9 +11744,9 @@ Transform: - {fileID: 1367779832} - {fileID: 929921271} - {fileID: 1811320353} - - {fileID: 97529179} - {fileID: 772780370} - {fileID: 566218255} + - {fileID: 97529179} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/TuteLevelFive.unity b/Assets/Scenes/TuteLevelFive.unity index 16834d7..215aafd 100644 --- a/Assets/Scenes/TuteLevelFive.unity +++ b/Assets/Scenes/TuteLevelFive.unity @@ -1596,7 +1596,7 @@ PrefabInstance: - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: nextScene - value: Main Menu + value: MainMenu objectReference: {fileID: 0} - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} @@ -3165,26 +3165,11 @@ PrefabInstance: propertyPath: m_RenderMode value: 1 objectReference: {fileID: 0} - - target: {fileID: 7103365429884932622, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_Text - value: 'Welcome To Tutorial - - Level Five' - objectReference: {fileID: 0} - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_AnchoredPosition.y value: -16 objectReference: {fileID: 0} - - target: {fileID: 7103365430021195166, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_Text - value: "In this level you will learn how to use the \nJump block, a jump block - allows you to jump over obstacles like water, or up onto obstacles like stumps\ndrag - and drop the move block to the logic trough??? and click play to watch the - character move" - objectReference: {fileID: 0} - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -3195,6 +3180,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnPlayClick objectReference: {fileID: 0} + - target: {fileID: 7103365429884932622, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_Text + value: 'Welcome To Tutorial + + Level Five' + objectReference: {fileID: 0} + - target: {fileID: 7103365430021195166, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_Text + value: "In this level you will learn how to use the \nJump block, a jump block + allows you to jump over obstacles like water, or up onto obstacles like stumps\ndrag + and drop the move block to the logic trough??? and click play to watch the + character move" + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!1 &1117427231 stripped diff --git a/Assets/Scripts/MainMenuController.cs b/Assets/Scripts/MainMenuController.cs index 1b49c96..bf9e1c0 100644 --- a/Assets/Scripts/MainMenuController.cs +++ b/Assets/Scripts/MainMenuController.cs @@ -5,10 +5,10 @@ using UnityEngine; public class MainMenuController : MonoBehaviour { - public Canvas GameOptionsMenu; - public Canvas SettingsMenu; - public Canvas MainMenu; - public Canvas HowToPlayMenu; + public GameObject GameOptionsMenu; + public GameObject SettingsMenu; + public GameObject MainMenu; + public GameObject HowToPlayMenu; public Button SoundButton; public Button MusicButton; @@ -19,30 +19,31 @@ public class MainMenuController : MonoBehaviour //On Awake private void Awake () { - MainMenu.enabled = true; - SettingsMenu.enabled = false; - GameOptionsMenu.enabled = false; - HowToPlayMenu.enabled = false; + MainMenu.SetActive (true); + SettingsMenu.SetActive (false); + GameOptionsMenu.SetActive (false); + HowToPlayMenu.SetActive (false); } //Main Menu Options public void OnPlayClick () { //toggle which menu displays - MainMenu.enabled = false; - GameOptionsMenu.enabled = true; + MainMenu.SetActive (false); + GameOptionsMenu.SetActive (true); } public void OnSettingsClick () { //toggle which menu displays - MainMenu.enabled = false; - SettingsMenu.enabled = true; + MainMenu.SetActive (false); + SettingsMenu.SetActive (true); } public void OnTutorialClick () { - HowToPlayMenu.enabled = true; + MainMenu.SetActive (false); + HowToPlayMenu.SetActive (true); } public void OnTutorialContinueClick () { @@ -52,9 +53,9 @@ public class MainMenuController : MonoBehaviour //Game Options and Settings Menu public void OnBackClick () { - GameOptionsMenu.enabled = false; - SettingsMenu.enabled = false; - MainMenu.enabled = true; + GameOptionsMenu.SetActive (false); + SettingsMenu.SetActive (false); + MainMenu.SetActive (true); } //Game Options Menu