diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index b2ef0a2..8348f30 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -255,7 +255,7 @@ RectTransform: m_LocalScale: {x: 0.00925926, y: 0.009259259, z: 1} m_Children: [] m_Father: {fileID: 465584224} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -452,6 +452,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1869170728} - {fileID: 1833852793} - {fileID: 384609361} - {fileID: 1810492795} @@ -2204,7 +2205,7 @@ Transform: - {fileID: 1259524806} - {fileID: 867919273} m_Father: {fileID: 465584224} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &896084743 MonoBehaviour: @@ -2588,6 +2589,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 30400d87b462847298c93b5dc0412288, type: 3} m_Name: m_EditorClassIdentifier: + chronos: + - {fileID: 1833852794} + - {fileID: 0} + firsts: + - {fileID: 1869170733} + - {fileID: 0} tachometers: - {fileID: 384609365} - {fileID: 0} @@ -4297,7 +4304,7 @@ RectTransform: m_LocalScale: {x: 0.00925926, y: 0.009259259, z: 1} m_Children: [] m_Father: {fileID: 465584224} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4968,7 +4975,7 @@ RectTransform: m_LocalScale: {x: 0.00926, y: 0.00926, z: 1} m_Children: [] m_Father: {fileID: 465584224} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5139,12 +5146,12 @@ RectTransform: m_LocalScale: {x: 0.00926, y: 0.00926, z: 1} m_Children: [] m_Father: {fileID: 465584224} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -19.75531, y: 3.0999756} - m_SizeDelta: {x: 1375.9, y: 290} + m_AnchoredPosition: {x: -17.75, y: 4.28} + m_SizeDelta: {x: 506.078, y: 154.443} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1833852794 MonoBehaviour: @@ -5159,7 +5166,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 1, b: 0, a: 1} + m_Color: {r: 0.5147059, g: 0.5147059, b: 0.5147059, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5168,18 +5175,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 200 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 300 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 'LUDICROUS + m_Text: '00:00:00 ' --- !u!222 &1833852795 @@ -5325,6 +5332,149 @@ GameObject: m_PrefabParentObject: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2} m_PrefabInternal: {fileID: 1233904144} +--- !u!1 &1869170727 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1045809786115746, guid: bc3b77b0893cb479da919affa35e5db8, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1869170728} + - component: {fileID: 1869170732} + - component: {fileID: 1869170731} + - component: {fileID: 1869170730} + - component: {fileID: 1869170729} + - component: {fileID: 1869170733} + m_Layer: 0 + m_Name: HUD First + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1869170728 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 224648850684918964, guid: bc3b77b0893cb479da919affa35e5db8, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1869170727} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 7.1400003} + m_LocalScale: {x: 0.00926, y: 0.00926, z: 1} + m_Children: [] + m_Father: {fileID: 465584224} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -17.75, y: -4.89} + m_SizeDelta: {x: 506.078, y: 154.443} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1869170729 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 222689866401922532, guid: bc3b77b0893cb479da919affa35e5db8, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1869170727} +--- !u!114 &1869170730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114996819234120348, guid: bc3b77b0893cb479da919affa35e5db8, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1869170727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1869170731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114121732694742092, guid: bc3b77b0893cb479da919affa35e5db8, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1869170727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1869170732 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 223072120173396734, guid: bc3b77b0893cb479da919affa35e5db8, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1869170727} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1869170733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114833771757330548, guid: bc3b77b0893cb479da919affa35e5db8, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1869170727} + 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: 0.5147059, g: 0.5147059, b: 0.5147059, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: '00:00:00 + +' --- !u!1001 &2006620243 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameScene/GameManager.cs b/Assets/Scripts/GameScene/GameManager.cs index 53ec649..66f7340 100644 --- a/Assets/Scripts/GameScene/GameManager.cs +++ b/Assets/Scripts/GameScene/GameManager.cs @@ -94,6 +94,7 @@ public class GameManager : MonoBehaviour _status = States.Menu; // TODO: Load Menu + foreach(var j in Input.GetJoystickNames()) Debug.Log(j); } private void Start() @@ -170,6 +171,15 @@ public class GameManager : MonoBehaviour return _skins[playerID]; } + public int GetFirst() + { + if (bm1.GetDistance () > bm2.GetDistance ()) + return 0; + if (bm1.GetDistance () < bm2.GetDistance ()) + return 1; + return -1; + } + // TODO: Remove once menus are ok void Update() { @@ -206,6 +216,10 @@ public class GameManager : MonoBehaviour } } + public float GetChrono() { + return Time.time; + } + void OnEnable() { SceneManager.sceneLoaded += OnLevelFinishedLoading; diff --git a/Assets/Scripts/GameScene/HUDManager.cs b/Assets/Scripts/GameScene/HUDManager.cs index e7bff2c..ec7c807 100644 --- a/Assets/Scripts/GameScene/HUDManager.cs +++ b/Assets/Scripts/GameScene/HUDManager.cs @@ -2,9 +2,12 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using System; public class HUDManager : MonoBehaviour { + public Text[] chronos; + public Text[] firsts; public Text[] tachometers; public Text[] maxSpeeds; public HUDProgress[] progressions; @@ -33,6 +36,18 @@ public class HUDManager : MonoBehaviour { UpdateSpeeds(0); UpdateProgress(0); UpdateDistance(0); + UpdateChrono (0); + UpdateFirst (0); + } + + void UpdateFirst(int bikeID) { + firsts [bikeID].text = (gm.GetFirst () + 1).ToString(); + } + + void UpdateChrono(int bikeID) { + float time = gm.GetChrono (); + TimeSpan timeSpan = TimeSpan.FromSeconds(time); + chronos [bikeID].text = string.Format("{0:D2}:{1:D2}:{2:D2}", timeSpan.Minutes, timeSpan.Seconds, timeSpan.Milliseconds / 10); } void UpdateDistance(int bikeID) {