From 94b8311da51989b67748cda3fed44a0d6de20bea Mon Sep 17 00:00:00 2001 From: francois Date: Thu, 15 Mar 2018 23:00:26 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20input=20D=C3=A9but=20navigation=20?= =?UTF-8?q?highscores?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/GameScene.unity | 50 +-- Assets/Scenes/Menus.unity | 475 ++++++++++++++++++++++-- Assets/Scripts/GameScene/GameManager.cs | 5 + Assets/Scripts/HighscoresUiManager.cs | 37 +- Assets/Scripts/ScrollBarButtonScript.cs | 4 +- ProjectSettings/InputManager.asset | 2 +- 6 files changed, 499 insertions(+), 74 deletions(-) diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 7c0c83c..5e108cf 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -1531,7 +1531,7 @@ Prefab: - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -1591,7 +1591,7 @@ Prefab: - target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -21.579166 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -1611,7 +1611,7 @@ Prefab: - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -1631,7 +1631,7 @@ Prefab: - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -133.42084 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_Name @@ -3288,7 +3288,7 @@ Prefab: - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3348,7 +3348,7 @@ Prefab: - target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -21.579166 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3368,7 +3368,7 @@ Prefab: - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3388,7 +3388,7 @@ Prefab: - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -133.42084 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_Name @@ -3472,7 +3472,7 @@ Prefab: - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3532,7 +3532,7 @@ Prefab: - target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -21.579166 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3552,7 +3552,7 @@ Prefab: - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3572,7 +3572,7 @@ Prefab: - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -133.42084 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_Name @@ -3797,7 +3797,7 @@ Prefab: - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3857,7 +3857,7 @@ Prefab: - target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -21.579166 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3877,7 +3877,7 @@ Prefab: - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -3897,7 +3897,7 @@ Prefab: - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -133.42084 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_Name @@ -4652,7 +4652,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1714708927 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5232,7 +5232,7 @@ Prefab: - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -5292,7 +5292,7 @@ Prefab: - target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -21.579166 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -5312,7 +5312,7 @@ Prefab: - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -5332,7 +5332,7 @@ Prefab: - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -133.42084 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -5407,7 +5407,7 @@ Prefab: - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -5467,7 +5467,7 @@ Prefab: - target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -21.579166 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -5487,7 +5487,7 @@ Prefab: - target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} @@ -5507,7 +5507,7 @@ Prefab: - target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_AnchoredPosition.y - value: -133.42084 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2} propertyPath: m_Name diff --git a/Assets/Scenes/Menus.unity b/Assets/Scenes/Menus.unity index d48e5c8..3bf8466 100644 --- a/Assets/Scenes/Menus.unity +++ b/Assets/Scenes/Menus.unity @@ -159,20 +159,46 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fd3dd54012b3be2438dbc7f320e35e40, type: 3} m_Name: m_EditorClassIdentifier: + InputDelay: 200 PlayerPanelImage: {fileID: 492428415} PlayerPanelText: {fileID: 2039829331} Player2: 1 - InputDelay: 200 Padding: 10 TransportsPanel: {fileID: 2049240257} NormalColor: {r: 235, g: 239, b: 179, a: 255} SelectorImage: {fileID: 21300000, guid: 40afa452a1eb10a45b7d9585767a24d8, type: 3} SelectorColor: {r: 0.0992647, g: 0.7941176, b: 0.13280922, a: 1} SelectionImage: {fileID: 0} - HorizontalAxisName: HorizontalP2 - VerticalAxisName: VerticalP2 - SubmitButtonName: SubmitP2 - CancelButtonName: CancelP2 +--- !u!1 &16142214 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1697148770} + serializedVersion: 5 + m_Component: + - component: {fileID: 16142215} + m_Layer: 0 + m_Name: Missing Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &16142215 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1697148770} + m_GameObject: {fileID: 16142214} + 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: 1956597768} + - {fileID: 1697148771} + m_Father: {fileID: 620616380} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &105730543 GameObject: m_ObjectHideFlags: 0 @@ -576,6 +602,36 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 151084378} +--- !u!1 &160677974 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 234357720} + serializedVersion: 5 + m_Component: + - component: {fileID: 160677975} + m_Layer: 0 + m_Name: Missing Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &160677975 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 234357720} + m_GameObject: {fileID: 160677974} + 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: 1259811302} + - {fileID: 234357721} + m_Father: {fileID: 620616380} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &184347291 GameObject: m_ObjectHideFlags: 0 @@ -1039,11 +1095,25 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_IsPrefabParent: 0 ---- !u!224 &234357721 stripped +--- !u!224 &234357721 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 224969415226408660, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 234357720} + m_GameObject: {fileID: 843787864} + 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: 160677975} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &251094678 GameObject: m_ObjectHideFlags: 0 @@ -1371,11 +1441,25 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_IsPrefabParent: 0 ---- !u!224 &284145551 stripped +--- !u!224 &284145551 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 224969415226408660, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 284145550} + m_GameObject: {fileID: 924236777} + 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: 1484302564} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &314624921 GameObject: m_ObjectHideFlags: 0 @@ -1651,6 +1735,21 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 319285935} +--- !u!1 &393264206 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1697148770} + serializedVersion: 5 + m_Component: + - component: {fileID: 1697148771} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &483903940 GameObject: m_ObjectHideFlags: 0 @@ -2177,11 +2276,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1625485410} - - {fileID: 284145551} - - {fileID: 1697148771} - - {fileID: 831371414} - - {fileID: 234357721} + - {fileID: 2017460681} + - {fileID: 1484302564} + - {fileID: 16142215} + - {fileID: 2082632829} + - {fileID: 160677975} m_Father: {fileID: 1207064687} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2263,9 +2362,11 @@ MonoBehaviour: - {fileID: 1956597767} - {fileID: 1940913573} - {fileID: 1259811301} - ResultText: {fileID: 1798360589} - XAxis: HorizontalP1 + PseudoText: {fileID: 0} + TimeText: {fileID: 0} + TransportImage: {fileID: 0} rank: 1 + Player2: 0 --- !u!1 &641709687 GameObject: m_ObjectHideFlags: 0 @@ -3241,11 +3342,40 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_IsPrefabParent: 0 ---- !u!224 &831371414 stripped +--- !u!224 &831371414 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 224969415226408660, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 831371413} + m_GameObject: {fileID: 2051646402} + 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: 2082632829} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &843787864 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 234357720} + serializedVersion: 5 + m_Component: + - component: {fileID: 234357721} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &868700325 GameObject: m_ObjectHideFlags: 0 @@ -3348,6 +3478,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &924236777 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 284145550} + serializedVersion: 5 + m_Component: + - component: {fileID: 284145551} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &953998989 GameObject: m_ObjectHideFlags: 0 @@ -4714,11 +4859,50 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1251039606} ---- !u!1 &1259811301 stripped +--- !u!1 &1257827694 GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1573159048} + serializedVersion: 5 + m_Component: + - component: {fileID: 1625485410} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1259811301 +GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1382578555604178, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 234357720} + serializedVersion: 5 + m_Component: + - component: {fileID: 1259811302} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1259811302 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 234357720} + m_GameObject: {fileID: 1259811301} + 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: 160677975} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1298849942 Prefab: m_ObjectHideFlags: 0 @@ -5054,20 +5238,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fd3dd54012b3be2438dbc7f320e35e40, type: 3} m_Name: m_EditorClassIdentifier: + InputDelay: 200 PlayerPanelImage: {fileID: 977855010} PlayerPanelText: {fileID: 1118367624} Player2: 0 - InputDelay: 200 Padding: 10 TransportsPanel: {fileID: 2049240257} NormalColor: {r: 235, g: 239, b: 179, a: 255} SelectorImage: {fileID: 21300000, guid: 3ddf9f222b5ed674e81ad3d27f507f57, type: 3} SelectorColor: {r: 1, g: 0, b: 0, a: 1} SelectionImage: {fileID: 0} - HorizontalAxisName: HorizontalP1 - VerticalAxisName: VerticalP1 - SubmitButtonName: SubmitP1 - CancelButtonName: CancelP1 --- !u!1 &1364888298 GameObject: m_ObjectHideFlags: 0 @@ -5384,6 +5564,36 @@ MonoBehaviour: PlayerOneSelector: {fileID: 1349418569} PlayerTwoSelector: {fileID: 4845151} GoButton: {fileID: 1345801215} +--- !u!1 &1484302563 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 284145550} + serializedVersion: 5 + m_Component: + - component: {fileID: 1484302564} + m_Layer: 0 + m_Name: Missing Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1484302564 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 284145550} + m_GameObject: {fileID: 1484302563} + 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: 1800919847} + - {fileID: 284145551} + m_Father: {fileID: 620616380} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1490128095 GameObject: m_ObjectHideFlags: 0 @@ -5841,17 +6051,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a3089903d7f7d648a34e6d9b4249463, type: 3} m_Name: m_EditorClassIdentifier: + InputDelay: 100 grid: {fileID: 1574281786} - Transports: - - {fileID: 21300000, guid: 5e5aa15eeebbb9b4d91b51b1be4d1b9a, type: 3} - - {fileID: 21300000, guid: 3f1c4bdd8395ac6429ff42fc32da9979, type: 3} - - {fileID: 21300000, guid: 769f59da1a572b1498ca93ca6f4ce637, type: 3} - - {fileID: 21300000, guid: 7c46cf47738bd4942a6ecf581cad1b86, type: 3} - - {fileID: 21300000, guid: c1892bf031c4dfe449720146bd70ceba, type: 3} - - {fileID: 21300000, guid: 6a8f085d2aaf45944a3231f952e31ae9, type: 3} - - {fileID: 21300000, guid: 52f4e3480388c4d44a69d61037b9e748, type: 3} - - {fileID: 21300000, guid: 1e789aa866dfadd4ab1c6223848940b5, type: 3} GridChildren: [] + HighscoresPanel: {fileID: 120214171} --- !u!1001 &1595668627 Prefab: m_ObjectHideFlags: 0 @@ -5995,16 +6198,54 @@ RectTransform: m_PrefabParentObject: {fileID: 224515872243337072, guid: 60df262eeb0558240b4bca3d316031e4, type: 2} m_PrefabInternal: {fileID: 1595668627} ---- !u!1 &1625485409 stripped +--- !u!1 &1625485409 GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1382578555604178, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 1573159048} ---- !u!224 &1625485410 stripped + serializedVersion: 5 + m_Component: + - component: {fileID: 1625485411} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1625485410 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 224969415226408660, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 1573159048} + m_GameObject: {fileID: 1257827694} + 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: 2017460681} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!4 &1625485411 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1573159048} + m_GameObject: {fileID: 1625485409} + 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: 2017460681} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1697148770 Prefab: m_ObjectHideFlags: 0 @@ -6194,11 +6435,25 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_IsPrefabParent: 0 ---- !u!224 &1697148771 stripped +--- !u!224 &1697148771 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 224969415226408660, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 1697148770} + m_GameObject: {fileID: 393264206} + 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: 16142215} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1766777649 GameObject: m_ObjectHideFlags: 0 @@ -6386,11 +6641,35 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1798360587} ---- !u!1 &1800919846 stripped +--- !u!1 &1800919846 GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1382578555604178, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 284145550} + serializedVersion: 5 + m_Component: + - component: {fileID: 1800919847} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1800919847 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 284145550} + m_GameObject: {fileID: 1800919846} + 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: 1484302564} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1825524199 GameObject: m_ObjectHideFlags: 0 @@ -6796,12 +7075,35 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4a1ecad72aeacb459a2e686072c49a7, type: 3} m_Name: m_EditorClassIdentifier: - Entries: [] ---- !u!1 &1940913573 stripped +--- !u!1 &1940913573 GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1382578555604178, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 831371413} + serializedVersion: 5 + m_Component: + - component: {fileID: 1940913574} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1940913574 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 831371413} + m_GameObject: {fileID: 1940913573} + 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: 2082632829} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1945706143 GameObject: m_ObjectHideFlags: 0 @@ -6912,11 +7214,35 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1945706143} ---- !u!1 &1956597767 stripped +--- !u!1 &1956597767 GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1382578555604178, guid: c5a4f9907b182104dac5170e325fef73, type: 2} m_PrefabInternal: {fileID: 1697148770} + serializedVersion: 5 + m_Component: + - component: {fileID: 1956597768} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1956597768 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1697148770} + m_GameObject: {fileID: 1956597767} + 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: 16142215} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1960925155 GameObject: m_ObjectHideFlags: 0 @@ -6986,6 +7312,36 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1960925155} +--- !u!1 &2017460680 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1573159048} + serializedVersion: 5 + m_Component: + - component: {fileID: 2017460681} + m_Layer: 0 + m_Name: Missing Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2017460681 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 1573159048} + m_GameObject: {fileID: 2017460680} + 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: 1625485411} + - {fileID: 1625485410} + m_Father: {fileID: 620616380} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2036004307 GameObject: m_ObjectHideFlags: 0 @@ -7236,6 +7592,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &2051646402 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 831371413} + serializedVersion: 5 + m_Component: + - component: {fileID: 831371414} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &2067530941 GameObject: m_ObjectHideFlags: 0 @@ -7304,6 +7675,36 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2067530941} +--- !u!1 &2082632828 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 831371413} + serializedVersion: 5 + m_Component: + - component: {fileID: 2082632829} + m_Layer: 0 + m_Name: Missing Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2082632829 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 831371413} + m_GameObject: {fileID: 2082632828} + 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: 1940913574} + - {fileID: 831371414} + m_Father: {fileID: 620616380} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2111900484 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameScene/GameManager.cs b/Assets/Scripts/GameScene/GameManager.cs index b4dea2b..53ec649 100644 --- a/Assets/Scripts/GameScene/GameManager.cs +++ b/Assets/Scripts/GameScene/GameManager.cs @@ -36,6 +36,11 @@ public class GameManager : MonoBehaviour public string GameSceneName = "GameScene"; public string MenuSceneName = "Menus"; + + public string XAxis = "Horizontal"; + public string YAxis = "Vertical"; + public string Submit = "Submit"; + public string Cancel = "Cancel"; public string XAxisP1 = "HorizontalP1"; public string YAxisP1 = "VerticalP1"; public string SubmitP1 = "SubmitP1"; diff --git a/Assets/Scripts/HighscoresUiManager.cs b/Assets/Scripts/HighscoresUiManager.cs index 575602f..e8774e9 100644 --- a/Assets/Scripts/HighscoresUiManager.cs +++ b/Assets/Scripts/HighscoresUiManager.cs @@ -5,34 +5,31 @@ using UnityEngine.UI; using System.Collections.Generic; using System.Linq; -public class HighscoresUiManager : MonoBehaviour +public class HighscoresUiManager : BaseInputBehavior { public GameObject grid; //public Sprite[] Transports; public List GridChildren = new List(); private string prefabPath = "Prefab/RankPanel"; - + public GameObject HighscoresPanel; + void OnEnable() { + InputDelay = 200; ClearGrid(); FillGrid(); } - - - - - private void FillGrid() { if (HighscoresManager.Current == null) return; - foreach(var entry in HighscoresManager.Current.Entries) + foreach (var entry in HighscoresManager.Current.Entries) { var rankPanel = Instantiate(Resources.Load(prefabPath)) as GameObject; var texts = new List(rankPanel.GetComponentsInChildren()); - texts.First(t => string.Equals(t.name,"rank", StringComparison.InvariantCultureIgnoreCase)) + texts.First(t => string.Equals(t.name, "rank", StringComparison.InvariantCultureIgnoreCase)) .text = entry.rank.ToString(); texts.First(t => string.Equals(t.name, "pseudo", StringComparison.InvariantCultureIgnoreCase)) .text = entry.pseudo.ToString(); @@ -55,4 +52,26 @@ public class HighscoresUiManager : MonoBehaviour Destroy(go); } } + + private void Update() + { + if (!IsSpawned) + { + if (!string.IsNullOrEmpty(GameManager.Instance.YAxis)) + { + var verticalAxis = Input.GetAxis(GameManager.Instance.YAxis); + if (Math.Abs(verticalAxis) == 1) + { + var script = HighscoresPanel.GetComponent(); + if (script != null) + { + if (verticalAxis == 1) script.GoUp(); + else script.GoDown(); + } + } + } + } + if(Input.GetKeyDown(GameManager.Instance.Submit) || Input.GetKeyDown(GameManager.Instance.Cancel)) + StartupScript.Current.Display(0, 2); + } } diff --git a/Assets/Scripts/ScrollBarButtonScript.cs b/Assets/Scripts/ScrollBarButtonScript.cs index efa2331..932dcc8 100644 --- a/Assets/Scripts/ScrollBarButtonScript.cs +++ b/Assets/Scripts/ScrollBarButtonScript.cs @@ -22,13 +22,13 @@ public class ScrollBarButtonScript : MonoBehaviour Scrollbar.value = 0; } - void GoDown() + public void GoDown() { Scrollbar.value -=step; Debug.Log(Scrollbar.value); } - void GoUp() + public void GoUp() { Scrollbar.value+=step; diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 6e3d909..33d7597 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -28,7 +28,7 @@ InputManager: negativeButton: down positiveButton: up altNegativeButton: s - altPositiveButton: w + altPositiveButton: z gravity: 3 dead: 0.001 sensitivity: 3