diff --git a/Assets/Scenes/ForestRacetrack.unity b/Assets/Scenes/ForestRacetrack.unity index 5eecf94..77501fb 100644 --- a/Assets/Scenes/ForestRacetrack.unity +++ b/Assets/Scenes/ForestRacetrack.unity @@ -2666,6 +2666,140 @@ Transform: m_CorrespondingSourceObject: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3} m_PrefabInstance: {fileID: 1462722214} m_PrefabAsset: {fileID: 0} +--- !u!1 &1263430742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1263430743} + - component: {fileID: 1263430745} + - component: {fileID: 1263430744} + m_Layer: 5 + m_Name: Speedometre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1263430743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263430742} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4459975215774235059} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 77, y: 66} + m_SizeDelta: {x: 508.17004, y: 68.92291} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1263430744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263430742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 123 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: -57.35727} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1263430745 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263430742} + m_CullTransparentMesh: 1 --- !u!1001 &1268455578 PrefabInstance: m_ObjectHideFlags: 0 @@ -5900,9 +6034,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + insertIndex: 2 + addedObject: {fileID: 1263430743} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad34455a014250446a5073260803b0a0, type: 3} +--- !u!224 &4459975215774235059 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + m_PrefabInstance: {fileID: 4459975215774235058} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8684226825208193988 PrefabInstance: m_ObjectHideFlags: 0 @@ -6011,6 +6153,10 @@ PrefabInstance: propertyPath: nextCarbtn value: objectReference: {fileID: 546571954} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: speedometer + value: + objectReference: {fileID: 1263430744} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: timeCounter value: diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 3e6c9d6..8479d77 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -17,8 +17,6 @@ public class GameController :MonoBehaviour public static bool RaceIsStarted { get { return true; } } public static bool RaceIsEnded { get { return false; } } - public TextMeshPro speedometer; - public List cars; int CurrentCarIndex = 0; @@ -29,14 +27,7 @@ public class GameController :MonoBehaviour { finished=gameObject.GetComponent().playersFinished; - if (speedometer == null) - { - speedometer = new TextMeshPro(); - } - if (carRB == null) - { - carRB = GetComponent(); - } + } public void Update () @@ -47,9 +38,7 @@ public class GameController :MonoBehaviour NextCar (); } - carVel = (math.abs(carRB.velocity.x) + math.abs(carRB.velocity.y) + math.abs(carRB.velocity.z))*5; - //print(carVel); - speedometer.SetText(carVel.ToString()); + } diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index eb1cf97..07adcda 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -26,6 +26,8 @@ public class GameManager : MonoBehaviour public GameObject nextCarbtn; float DNFTimer = 0; private bool hasCountedDown = false; + + private Rigidbody carRB; void Start() { AudioSource backgroundMusic = GameObject.Find("Car Data").GetComponent(); @@ -96,9 +98,8 @@ public class GameManager : MonoBehaviour else { int checkpointsCollected = player.GetComponent().checkpointsCollected; - - carRB = player.GetComponent(); - carVel = (math.abs(carRB.velocity.x) + math.abs(carRB.velocity.y) + math.abs(carRB.velocity.z))*5; + carRB = player.GetComponent(); + var carVel = (Mathf.Abs(carRB.velocity.x) + Mathf.Abs(carRB.velocity.y) + Mathf.Abs(carRB.velocity.z))*5; speedometer.SetText(carVel.ToString()); if (checkpointsCollected == checkpoints.Count())