diff --git a/Assets/Prefabs/Art3D/ShieldBar.prefab b/Assets/Prefabs/Art3D/ShieldBar.prefab index 6550878..bfc7d6e 100644 --- a/Assets/Prefabs/Art3D/ShieldBar.prefab +++ b/Assets/Prefabs/Art3D/ShieldBar.prefab @@ -110,6 +110,16 @@ PrefabInstance: propertyPath: m_Name value: Shield_Bar_V002 objectReference: {fileID: 0} + - target: {fileID: 3417444160447356044, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalScale.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3417444160447356044, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalScale.z + value: 80 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/GameCanvas.prefab b/Assets/Prefabs/GameCanvas.prefab index 7f7d798..d07d408 100644 --- a/Assets/Prefabs/GameCanvas.prefab +++ b/Assets/Prefabs/GameCanvas.prefab @@ -110,7 +110,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5018153252802778155 RectTransform: m_ObjectHideFlags: 0 @@ -125,6 +125,7 @@ RectTransform: m_Children: - {fileID: 450953812910381365} - {fileID: 7960376733688604242} + - {fileID: 4284223169977514699} m_Father: {fileID: 834552907522022778} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -478,6 +479,101 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} m_EffectDistance: {x: 2, y: -2} m_UseGraphicAlpha: 1 +--- !u!1 &7447354865271083572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4284223169977514699} + - component: {fileID: 1711567667057391844} + - component: {fileID: 8522275853895335114} + - component: {fileID: 1094226117655097979} + m_Layer: 5 + m_Name: FinalScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4284223169977514699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447354865271083572} + 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: 5018153252802778155} + 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: -100} + m_SizeDelta: {x: 100, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1711567667057391844 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447354865271083572} + m_CullTransparentMesh: 1 +--- !u!114 &8522275853895335114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447354865271083572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 'Your final score is: 420.69' +--- !u!114 &1094226117655097979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447354865271083572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &7696438193072300722 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/WorldScene.unity b/Assets/Scenes/WorldScene.unity index 38d8d65..80fc0b6 100644 --- a/Assets/Scenes/WorldScene.unity +++ b/Assets/Scenes/WorldScene.unity @@ -409,6 +409,108 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3} +--- !u!1 &479830774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 479830775} + - component: {fileID: 479830778} + - component: {fileID: 479830777} + - component: {fileID: 479830776} + m_Layer: 0 + m_Name: Recanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &479830775 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479830774} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 880466087} + m_Father: {fileID: 782229191} + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &479830776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479830774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &479830777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479830774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, 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 + m_PresetInfoIsWorld: 0 +--- !u!223 &479830778 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479830774} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 782229189} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1001 &739366992 PrefabInstance: m_ObjectHideFlags: 0 @@ -477,16 +579,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5539847617648870874, guid: c0a03ce6c4f39224299267b83719ceb7, - type: 3} - propertyPath: m_LocalScale.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 5539847617648870874, guid: c0a03ce6c4f39224299267b83719ceb7, - type: 3} - propertyPath: m_LocalScale.z - value: 80 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -634,8 +726,105 @@ Transform: m_Children: - {fileID: 1003288350} - {fileID: 1557857216} + - {fileID: 479830775} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &880466086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 880466087} + - component: {fileID: 880466090} + - component: {fileID: 880466089} + - component: {fileID: 880466088} + m_Layer: 0 + m_Name: ScoreText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &880466087 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880466086} + 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: 479830775} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: -40} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &880466088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880466086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 90 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Hello There +--- !u!222 &880466089 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880466086} + m_CullTransparentMesh: 1 +--- !u!114 &880466090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880466086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d56c8d3df304813a6e3861d997167d8, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: {fileID: 880466088} + k__BackingField: {fileID: 1758685210} + k__BackingField: {fileID: 447617108} --- !u!4 &1003288350 stripped Transform: m_CorrespondingSourceObject: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, @@ -1283,16 +1472,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1912500691838987139, guid: e29ce1fe47a855c4e907d4312c9e9d6e, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3} propertyPath: m_Name value: GameCanvas objectReference: {fileID: 0} + - target: {fileID: 2058749420242249500, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3} propertyPath: m_LocalPosition.x @@ -1343,11 +1532,28 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4509675489510948023, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3} +--- !u!114 &1758685210 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + m_PrefabInstance: {fileID: 1758685209} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1909908769 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ScoreTracker.cs b/Assets/Scripts/ScoreTracker.cs new file mode 100644 index 0000000..7bc95dc --- /dev/null +++ b/Assets/Scripts/ScoreTracker.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace InterfaceOff.WorldScene +{ + [System.Serializable] public struct PlayerScore + { + private string PlayerName; + private float Score; + } + + public class ScoreTracker : MonoBehaviour + { + [field: SerializeField] private bool GameAngliaVersion { get; set; } + [field: SerializeField] private Text ScoreText { get; set; } + [field: SerializeField] private Text FinalScoreText { get; set; } + [field: SerializeField] private WindowSpawner Spawner { get; set; } + + private static List PlayerScores { get; } = new(); + + private bool StoredScore = false; + private float Score = 0f; + + private void Update() + { + if (Spawner.AutoSpawn) + { + ScoreText.text = $"Score: {Time.timeSinceLevelLoad:F1}"; + Score = Time.timeSinceLevelLoad; + } + + else + { + FinalScoreText.text = $"Your final score is: {Score:F1}"; + ScoreText.text = null; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/ScoreTracker.cs.meta b/Assets/Scripts/ScoreTracker.cs.meta new file mode 100644 index 0000000..9fba8f6 --- /dev/null +++ b/Assets/Scripts/ScoreTracker.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0d56c8d3df304813a6e3861d997167d8 +timeCreated: 1769076867 \ No newline at end of file