diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 4e712e4..0b21877 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: 170076734} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -262,12 +262,12 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "These tutorial levels are to prepare you for the multiplayer mixed levels\nYou - collect new blocks and store them in your backpack. You then use these blocks + collect new blocks and store them in your inventory. You then use these blocks each turn to help you move and navigate around the level to reach the end portal. This tutorial will introduce you to the main five blocks; \nMove, Rotate Left, Rotate Right, a For-Loop and Jump\n\nYou have a maximum of five moves to make - each turn, to make your moves you must drag and drop the blocks from your backpack - to the _____, once you have dragged your moves in press the ___ button and watch + each turn, to make your moves you must drag and drop the blocks from your inventory + to the tray, once you have dragged your moves in press the play button and watch your character go!" --- !u!222 &58739263 CanvasRenderer: @@ -1288,7 +1288,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &532262370 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1321,9 +1321,9 @@ MonoBehaviour: m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1600, y: 900} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1339,7 +1339,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 10 + m_PlaneDistance: 95 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -1606,7 +1606,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &641788367 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1639,9 +1639,9 @@ MonoBehaviour: m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1600, y: 900} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1657,7 +1657,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 10 + m_PlaneDistance: 95 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -1682,6 +1682,7 @@ RectTransform: - {fileID: 1046821557} - {fileID: 1665362271} - {fileID: 1329078025} + - {fileID: 2107212856} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1924,7 +1925,7 @@ GameObject: - component: {fileID: 784048641} - component: {fileID: 784048640} m_Layer: 5 - m_Name: '...' + m_Name: Difficulty m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1989,7 +1990,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 784048641} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1646428055} + m_MethodName: OnDifficultyClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &784048641 @@ -3515,7 +3527,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 10 + m_PlaneDistance: 95 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -3557,9 +3569,9 @@ MonoBehaviour: m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1600, y: 900} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -3778,6 +3790,7 @@ MonoBehaviour: HowToPlayMenu: {fileID: 641788366} SoundButton: {fileID: 477405345} MusicButton: {fileID: 1107977225} + DifficultyButton: {fileID: 784048640} --- !u!1 &1665362270 GameObject: m_ObjectHideFlags: 0 @@ -4240,7 +4253,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: '.....: ON' + m_Text: 'Difficulty: EASY' --- !u!222 &1940981762 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4684,6 +4697,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2044973426} m_CullTransparentMesh: 0 +--- !u!1 &2107212855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2107212856} + - component: {fileID: 2107212859} + - component: {fileID: 2107212858} + - component: {fileID: 2107212857} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2107212856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107212855} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 641788370} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2107212857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107212855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1254083943, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 4 + m_AspectRatio: 1.7777778 +--- !u!114 &2107212858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107212855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 4f47d65753db7b045921f2f177da5062, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &2107212859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107212855} + m_CullTransparentMesh: 0 --- !u!1 &2128700971 GameObject: m_ObjectHideFlags: 0 @@ -4735,9 +4837,9 @@ MonoBehaviour: m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 800, y: 800} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -4753,7 +4855,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 534669904} - m_PlaneDistance: 10 + m_PlaneDistance: 95 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 diff --git a/Assets/Scenes/TuteLevelFive.unity b/Assets/Scenes/TuteLevelFive.unity index 790d861..eb45939 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: @@ -665,7 +665,7 @@ PrefabInstance: - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.0000010964048 + value: -0.000043101732 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} @@ -3422,8 +3422,8 @@ PrefabInstance: 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" + and drop the move block to the tray and click play to watch the character + move" objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} diff --git a/Assets/Scenes/TuteLevelFour.unity b/Assets/Scenes/TuteLevelFour.unity index 6907956..650f142 100644 --- a/Assets/Scenes/TuteLevelFour.unity +++ b/Assets/Scenes/TuteLevelFour.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2494,26 +2494,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 Four' - objectReference: {fileID: 0} - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_AnchoredPosition.y value: -15 objectReference: {fileID: 0} - - target: {fileID: 7103365430021195166, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_Text - value: "In this level you will learn how to use the \nFor-Loop block, a for-loop - block will run its inner blocks a specified number of times allowing you to - cover greater distances drag and drop the move block to the logic line? then - 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 @@ -2524,6 +2509,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 Four' + objectReference: {fileID: 0} + - target: {fileID: 7103365430021195166, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_Text + value: "In this level you will learn how to use the \nFor-Loop block, a for-loop + block will run its inner blocks a specified number of times allowing you to + cover greater distances drag and drop the move block to the tray then click + play to watch the character move" + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!1 &1724137008 stripped diff --git a/Assets/Scenes/TuteLevelOne.unity b/Assets/Scenes/TuteLevelOne.unity index f27c294..4aa9479 100644 --- a/Assets/Scenes/TuteLevelOne.unity +++ b/Assets/Scenes/TuteLevelOne.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1586,18 +1586,18 @@ PrefabInstance: propertyPath: m_RenderMode value: 1 objectReference: {fileID: 0} + - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1425704337} - target: {fileID: 7103365430021195166, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_Text value: "In this level you will learn how to use the \nmove forward block, a move block allows your character to move forward one tile in the direction - you are facing\ndrag and drop the move block to the logic line? then\nclick - play to watch the character move" + you are facing\ndrag and drop the move block to the tray then\nclick 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 - value: - objectReference: {fileID: 1425704337} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} diff --git a/Assets/Scenes/TuteLevelThree.unity b/Assets/Scenes/TuteLevelThree.unity index 55e3f71..5a827fb 100644 --- a/Assets/Scenes/TuteLevelThree.unity +++ b/Assets/Scenes/TuteLevelThree.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -239,6 +239,16 @@ PrefabInstance: propertyPath: m_RenderMode value: 1 objectReference: {fileID: 0} + - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 862455471} + - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + 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 @@ -251,19 +261,9 @@ PrefabInstance: propertyPath: m_Text value: "In this level you will learn how to use the \nrotate right block, a rotate left block allows your character to rotate to the right 90 degrees\ndrag - and drop the move block to the logic line? then\nclick play to watch the character + and drop the move block to the tray then\nclick 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 - value: - objectReference: {fileID: 862455471} - - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnPlayClick - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!1 &4947114 stripped diff --git a/Assets/Scenes/TuteLevelTwo.unity b/Assets/Scenes/TuteLevelTwo.unity index 4e991d8..0c26612 100644 --- a/Assets/Scenes/TuteLevelTwo.unity +++ b/Assets/Scenes/TuteLevelTwo.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -486,6 +486,11 @@ PrefabInstance: propertyPath: m_RenderMode value: 1 objectReference: {fileID: 0} + - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1826484083} - target: {fileID: 7103365429884932622, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_Text @@ -498,14 +503,8 @@ PrefabInstance: propertyPath: m_Text value: "In this level you will learn how to use the \nrotate left block, a rotate left block allows your character to rotate to the left 90 degrees\ndrag and - drop the move block to the logic line? then\nclick play to watch the character - move" + drop the move block to the tray then\nclick 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 - value: - objectReference: {fileID: 1826484083} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!1 &800881723 diff --git a/Assets/Scripts/MainMenuController.cs b/Assets/Scripts/MainMenuController.cs index bf9e1c0..7b2849c 100644 --- a/Assets/Scripts/MainMenuController.cs +++ b/Assets/Scripts/MainMenuController.cs @@ -12,10 +12,13 @@ public class MainMenuController : MonoBehaviour public Button SoundButton; public Button MusicButton; + public Button DifficultyButton; - bool soundVolume = true; + bool soundVolume = true; bool musicVolume = true; + int difficulty = 1; + //On Awake private void Awake () { @@ -99,8 +102,22 @@ public class MainMenuController : MonoBehaviour } } - public void OnUnknownClick () + public void OnDifficultyClick () { - - } + if (difficulty == 1) + { + DifficultyButton.GetComponentInChildren().text = "Difficulty: MEDIUM"; + difficulty = 2; + } + else if(difficulty == 2) + { + DifficultyButton.GetComponentInChildren().text = "Difficulty: HARD"; + difficulty = 3; + } + else + { + DifficultyButton.GetComponentInChildren().text = "Difficulty: EASY"; + difficulty = 1; + } + } }