diff --git a/Assets/Scenes/Menus.unity b/Assets/Scenes/Menus.unity index 3222af3..e2c9fde 100644 --- a/Assets/Scenes/Menus.unity +++ b/Assets/Scenes/Menus.unity @@ -124,6 +124,8 @@ GameObject: - component: {fileID: 129449665} - component: {fileID: 129449664} - component: {fileID: 129449663} + - component: {fileID: 129449667} + - component: {fileID: 129449666} m_Layer: 5 m_Name: StartBtn m_TagString: Untagged @@ -170,7 +172,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.384, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 @@ -224,6 +226,122 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 129449661} +--- !u!114 &129449666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 129449661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f0e60532f7fa67449687cc65d45ec1a, type: 3} + m_Name: + m_EditorClassIdentifier: + Icon: {fileID: 1400122277} +--- !u!114 &129449667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 129449661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 9 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 129449666} + m_MethodName: Apply + 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: 0 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!1 &318395223 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 318395224} + - component: {fileID: 318395226} + - component: {fileID: 318395225} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &318395224 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318395223} + 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: 1849322672} + m_RootOrder: 0 + 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 &318395225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318395223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_FontData: + m_Font: {fileID: 12800000, guid: 8716cefd1802c7046b79c87025899665, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Quitter +--- !u!222 &318395226 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318395223} --- !u!1 &614059344 GameObject: m_ObjectHideFlags: 0 @@ -235,6 +353,8 @@ GameObject: - component: {fileID: 614059348} - component: {fileID: 614059347} - component: {fileID: 614059346} + - component: {fileID: 614059349} + - component: {fileID: 614059350} m_Layer: 5 m_Name: HighscoresBtn m_TagString: Untagged @@ -335,6 +455,48 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 614059344} +--- !u!114 &614059349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 614059344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f0e60532f7fa67449687cc65d45ec1a, type: 3} + m_Name: + m_EditorClassIdentifier: + Icon: {fileID: 1400122277} +--- !u!114 &614059350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 614059344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 9 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 614059349} + m_MethodName: Apply + 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: 0 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] --- !u!1 &750695357 GameObject: m_ObjectHideFlags: 0 @@ -346,6 +508,7 @@ GameObject: - component: {fileID: 750695360} - component: {fileID: 750695359} - component: {fileID: 750695361} + - component: {fileID: 750695362} m_Layer: 5 m_Name: ButtonsPanel m_TagString: Untagged @@ -366,8 +529,9 @@ RectTransform: - {fileID: 129449662} - {fileID: 861410646} - {fileID: 614059345} + - {fileID: 1849322672} m_Father: {fileID: 1197051010} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.1} m_AnchorMax: {x: 1, y: 0.4} @@ -429,6 +593,18 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!114 &750695362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 750695357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f0e60532f7fa67449687cc65d45ec1a, type: 3} + m_Name: + m_EditorClassIdentifier: + Icon: {fileID: 0} --- !u!1 &808525958 GameObject: m_ObjectHideFlags: 0 @@ -440,7 +616,7 @@ GameObject: - component: {fileID: 808525961} - component: {fileID: 808525960} m_Layer: 5 - m_Name: Image + m_Name: GoldSprintLabel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -457,7 +633,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 4} m_Children: [] m_Father: {fileID: 1197051010} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.4} m_AnchorMax: {x: 1, y: 0.7} @@ -508,6 +684,8 @@ GameObject: - component: {fileID: 861410649} - component: {fileID: 861410648} - component: {fileID: 861410647} + - component: {fileID: 861410651} + - component: {fileID: 861410650} m_Layer: 5 m_Name: OptionsBtn m_TagString: Untagged @@ -608,6 +786,48 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 861410645} +--- !u!114 &861410650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861410645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f0e60532f7fa67449687cc65d45ec1a, type: 3} + m_Name: + m_EditorClassIdentifier: + Icon: {fileID: 1400122277} +--- !u!114 &861410651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861410645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 9 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 861410650} + m_MethodName: Apply + 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: 0 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] --- !u!1 &953998989 GameObject: m_ObjectHideFlags: 0 @@ -863,10 +1083,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2012512047} - {fileID: 1400122277} - {fileID: 808525959} - {fileID: 750695358} - - {fileID: 2012512047} m_Father: {fileID: 1911201215} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -919,7 +1139,7 @@ GameObject: - component: {fileID: 1400122279} - component: {fileID: 1400122278} m_Layer: 5 - m_Name: Image + m_Name: BikeIconImg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -936,7 +1156,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197051010} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1050,6 +1270,141 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1831767301} +--- !u!1 &1849322671 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1849322672} + - component: {fileID: 1849322675} + - component: {fileID: 1849322674} + - component: {fileID: 1849322673} + - component: {fileID: 1849322676} + m_Layer: 5 + m_Name: QuitBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1849322672 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1849322671} + 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: + - {fileID: 318395224} + m_Father: {fileID: 750695358} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1849322673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1849322671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1849322674} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1849322676} + m_MethodName: Quit + 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 &1849322674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1849322671} + 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: 0} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1849322675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1849322671} +--- !u!114 &1849322676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1849322671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f0e60532f7fa67449687cc65d45ec1a, type: 3} + m_Name: + m_EditorClassIdentifier: + Icon: {fileID: 1400122277} --- !u!1 &1911201211 GameObject: m_ObjectHideFlags: 0 @@ -1155,7 +1510,7 @@ GameObject: - component: {fileID: 2012512049} - component: {fileID: 2012512048} m_Layer: 5 - m_Name: Image (1) + m_Name: LPRLogo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1172,7 +1527,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1197051010} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.37920773, y: 0.72200006} m_AnchorMax: {x: 0.62066174, y: 0.97271705} @@ -1258,7 +1613,7 @@ MonoBehaviour: m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} + m_FirstSelected: {fileID: 129449661} m_sendNavigationEvents: 1 m_DragThreshold: 5 --- !u!4 &2036004310 diff --git a/Assets/Scripts/ManageButtonsSelectionWithIcon.cs b/Assets/Scripts/ManageButtonsSelectionWithIcon.cs index 0795622..b605589 100644 --- a/Assets/Scripts/ManageButtonsSelectionWithIcon.cs +++ b/Assets/Scripts/ManageButtonsSelectionWithIcon.cs @@ -1,26 +1,43 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; -public class ManageButtonsSelectionWithIcon : MonoBehaviour { +public class ManageButtonsSelectionWithIcon : MonoBehaviour, ISelectHandler +{ - public Transform IconImage; - public Transform StartButton; - public Transform OptionButton; - public Transform HighscoresButton; - public Transform QuitButton; + public Transform Icon; + bool started = false; // Use this for initialization - void Start () { - - IconImage = transform.Find("BikeIconImg"); + void Start() + { + started = true; + //IconImage = transform.Find("BikeIconImg"); //var btn = StartButton.GetComponent