diff --git a/Assets/Prefabs/StatisticManager.prefab b/Assets/Prefabs/StatisticManager.prefab new file mode 100644 index 0000000000000000000000000000000000000000..2daad573d7cff44823794097a11be11a0e327ceb --- /dev/null +++ b/Assets/Prefabs/StatisticManager.prefab @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &369398794076319583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4594954198229481618} + - component: {fileID: 1116354047580473904} + m_Layer: 0 + m_Name: StatisticManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4594954198229481618 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 369398794076319583} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 740.34344, y: 293.34494, z: -4.2286654} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1116354047580473904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 369398794076319583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e5adf33a49b7da49a887077de0a1a75, type: 3} + m_Name: + m_EditorClassIdentifier: + statisticGame: {fileID: 0} + weapons: {fileID: 0} + playerHealth: {fileID: 0} + playerMovement: {fileID: 0} + sceneStopwatch: {fileID: 0} diff --git a/Assets/Prefabs/StatisticManager.prefab.meta b/Assets/Prefabs/StatisticManager.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..34f334355be26e5b55397e8be6d3e90fa7b6b0ab --- /dev/null +++ b/Assets/Prefabs/StatisticManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e772e5b9f45d07e408062e894107aaa6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_CompletedAssets/Scenes/Level1.unity b/Assets/_CompletedAssets/Scenes/Level1.unity index 5fdd088cc49fc8046cf228ed72fdf57205e01d1d..0bd6476b391f0054e7d051b8fe6bfe377bcd6a4c 100644 --- a/Assets/_CompletedAssets/Scenes/Level1.unity +++ b/Assets/_CompletedAssets/Scenes/Level1.unity @@ -1839,55 +1839,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 692873477} m_CullTransparentMesh: 0 ---- !u!1 &719900037 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 719900038} - - component: {fileID: 719900039} - m_Layer: 0 - m_Name: StatisticManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &719900038 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 719900037} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 740.34344, y: 293.34494, z: -4.2286654} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &719900039 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 719900037} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e5adf33a49b7da49a887077de0a1a75, type: 3} - m_Name: - m_EditorClassIdentifier: - statisticGame: {fileID: 867167058} - weapons: {fileID: 2006796489} - playerHealth: {fileID: 2023876516} - playerMovement: {fileID: 1641232236} - sceneStopwatch: {fileID: 1365577260} --- !u!1 &733008142 GameObject: m_ObjectHideFlags: 0 @@ -2647,36 +2598,6 @@ MonoBehaviour: 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: 0.784} - 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: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 150 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Returning to main menu in 10 ---- !u!222 &1230715287 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230715284} - m_CullTransparentMesh: 0 --- !u!1001 &1315884646 PrefabInstance: m_ObjectHideFlags: 0 @@ -3182,11 +3103,7 @@ PrefabInstance: objectReference: {fileID: 1415853692} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 3505870070799784637, guid: 420d052720d6dee47abc3b3b63b1264c, - type: 3} - insertIndex: 12 - addedObject: {fileID: 466540664} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} --- !u!95 &1415853692 stripped @@ -4435,6 +4352,11 @@ PrefabInstance: propertyPath: m_Name value: Statistic objectReference: {fileID: 0} + - target: {fileID: 1448553402749689564, guid: f1982d48202378946aa90087f297169b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2238504328828021542, guid: f1982d48202378946aa90087f297169b, type: 3} propertyPath: m_Pivot.x @@ -4643,6 +4565,99 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3f7c56ab0ead11746a1e61dd1320ba88, type: 3} +--- !u!1001 &8333409822825959999 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 369398794076319583, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_Name + value: StatisticManager + objectReference: {fileID: 0} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: weapons + value: + objectReference: {fileID: 2006796489} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerHealth + value: + objectReference: {fileID: 2023876516} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: statisticGame + value: + objectReference: {fileID: 867167058} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerMovement + value: + objectReference: {fileID: 1641232236} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: sceneStopwatch + value: + objectReference: {fileID: 1365577260} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.x + value: 740.34344 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.y + value: 293.34494 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.2286654 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e772e5b9f45d07e408062e894107aaa6, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -4669,4 +4684,4 @@ SceneRoots: - {fileID: 979082580} - {fileID: 5655000232551366726} - {fileID: 1106271382} - - {fileID: 719900038} + - {fileID: 8333409822825959999} diff --git a/Assets/_CompletedAssets/Scenes/Level2.unity b/Assets/_CompletedAssets/Scenes/Level2.unity index 59850472b77554273ba5fd0054e1f375b3b7d847..0f592bdceb0448b80994cacba1053c25b451865b 100644 --- a/Assets/_CompletedAssets/Scenes/Level2.unity +++ b/Assets/_CompletedAssets/Scenes/Level2.unity @@ -2441,6 +2441,99 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664994689} m_CullTransparentMesh: 0 +--- !u!1001 &669871780 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 369398794076319583, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_Name + value: StatisticManager + objectReference: {fileID: 0} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: weapons + value: + objectReference: {fileID: 1641232235} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerHealth + value: + objectReference: {fileID: 2023876516} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: statisticGame + value: + objectReference: {fileID: 1948589444} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerMovement + value: + objectReference: {fileID: 817186638} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: sceneStopwatch + value: + objectReference: {fileID: 514837888} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.x + value: 740.34344 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.y + value: 293.34494 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.2286654 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e772e5b9f45d07e408062e894107aaa6, type: 3} --- !u!1 &675278765 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2107674136162243670, guid: 420d052720d6dee47abc3b3b63b1264c, @@ -3440,55 +3533,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 00a57bda1a27e5a45a9fec9343019fc4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1256297602 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1256297604} - - component: {fileID: 1256297603} - m_Layer: 0 - m_Name: StatisticManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1256297603 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1256297602} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e5adf33a49b7da49a887077de0a1a75, type: 3} - m_Name: - m_EditorClassIdentifier: - statisticGame: {fileID: 1948589444} - weapons: {fileID: 1641232235} - playerHealth: {fileID: 2023876516} - playerMovement: {fileID: 817186638} - sceneStopwatch: {fileID: 514837888} ---- !u!4 &1256297604 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1256297602} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 740.34344, y: 293.34494, z: -4.2286654} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1259979589 PrefabInstance: m_ObjectHideFlags: 0 @@ -5342,4 +5386,4 @@ SceneRoots: - {fileID: 1259979589} - {fileID: 1131056019} - {fileID: 128854635} - - {fileID: 1256297604} + - {fileID: 669871780} diff --git a/Assets/_CompletedAssets/Scenes/Level3.unity b/Assets/_CompletedAssets/Scenes/Level3.unity index 8339c0cef6f69d9b24ecea9aa4c5575d9c03cc4f..3753e52263d8e7901925d6b22648c041ca754c5b 100644 --- a/Assets/_CompletedAssets/Scenes/Level3.unity +++ b/Assets/_CompletedAssets/Scenes/Level3.unity @@ -661,6 +661,99 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1f7a4768cad2f8649bd9a043122fa2a4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &235618632 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 369398794076319583, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_Name + value: StatisticManager + objectReference: {fileID: 0} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: weapons + value: + objectReference: {fileID: 1641232235} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerHealth + value: + objectReference: {fileID: 2023876516} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: statisticGame + value: + objectReference: {fileID: 790169745} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerMovement + value: + objectReference: {fileID: 110447963} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: sceneStopwatch + value: + objectReference: {fileID: 699781908} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.x + value: 740.34344 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.y + value: 293.34494 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.2286654 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e772e5b9f45d07e408062e894107aaa6, type: 3} --- !u!114 &237742116 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9207442082530403052, guid: 420d052720d6dee47abc3b3b63b1264c, @@ -1279,55 +1372,6 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 2, y: -2} m_UseGraphicAlpha: 1 ---- !u!1 &400395845 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 400395847} - - component: {fileID: 400395846} - m_Layer: 0 - m_Name: StatisticManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &400395846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400395845} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e5adf33a49b7da49a887077de0a1a75, type: 3} - m_Name: - m_EditorClassIdentifier: - statisticGame: {fileID: 790169745} - weapons: {fileID: 1641232235} - playerHealth: {fileID: 2023876516} - playerMovement: {fileID: 110447963} - sceneStopwatch: {fileID: 699781908} ---- !u!4 &400395847 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400395845} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 740.34344, y: 293.34494, z: -4.2286654} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &435515921 GameObject: m_ObjectHideFlags: 0 @@ -3530,11 +3574,7 @@ PrefabInstance: objectReference: {fileID: 363229162} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 3505870070799784637, guid: 420d052720d6dee47abc3b3b63b1264c, - type: 3} - insertIndex: 12 - addedObject: {fileID: 363229163} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} --- !u!114 &1666523206 stripped @@ -4213,4 +4253,4 @@ SceneRoots: - {fileID: 556245256} - {fileID: 1184137226} - {fileID: 1175793130} - - {fileID: 400395847} + - {fileID: 235618632} diff --git a/Assets/_CompletedAssets/Scenes/LevelBoss.unity b/Assets/_CompletedAssets/Scenes/LevelBoss.unity index 370c53de5700523eeb268a4225190ebe3d5a0d78..eae49c4d24323dd54ec2b567b6a6b1a35bbef79c 100644 --- a/Assets/_CompletedAssets/Scenes/LevelBoss.unity +++ b/Assets/_CompletedAssets/Scenes/LevelBoss.unity @@ -3024,55 +3024,99 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -14, y: -4} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1018243736 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1018243738} - - component: {fileID: 1018243737} - m_Layer: 0 - m_Name: StatisticManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1018243737 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1018243736} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e5adf33a49b7da49a887077de0a1a75, type: 3} - m_Name: - m_EditorClassIdentifier: - statisticGame: {fileID: 508494930} - weapons: {fileID: 1641232235} - playerHealth: {fileID: 2023876516} - playerMovement: {fileID: 1826573836} - sceneStopwatch: {fileID: 1137589281} ---- !u!4 &1018243738 -Transform: +--- !u!1001 &945251721 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1018243736} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 740.34344, y: 293.34494, z: -4.2286654} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 369398794076319583, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_Name + value: StatisticManager + objectReference: {fileID: 0} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: weapons + value: + objectReference: {fileID: 1641232235} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerHealth + value: + objectReference: {fileID: 2023876516} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: statisticGame + value: + objectReference: {fileID: 508494930} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: playerMovement + value: + objectReference: {fileID: 1826573836} + - target: {fileID: 1116354047580473904, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: sceneStopwatch + value: + objectReference: {fileID: 1137589281} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.x + value: 740.34344 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.y + value: 293.34494 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.2286654 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4594954198229481618, guid: e772e5b9f45d07e408062e894107aaa6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e772e5b9f45d07e408062e894107aaa6, type: 3} --- !u!1 &1038376789 GameObject: m_ObjectHideFlags: 0 @@ -5442,4 +5486,4 @@ SceneRoots: - {fileID: 1841788131} - {fileID: 1427171794} - {fileID: 1063829061} - - {fileID: 1018243738} + - {fileID: 945251721} diff --git a/Assets/_CompletedAssets/Scripts/Managers/StatisticManager.cs b/Assets/_CompletedAssets/Scripts/Managers/StatisticManager.cs index ce3cdf299376bb8c5d0f4eca3492b3c9b2e218f6..cecfc90be0f8ea22de7541759c0c35335a6c4a36 100644 --- a/Assets/_CompletedAssets/Scripts/Managers/StatisticManager.cs +++ b/Assets/_CompletedAssets/Scripts/Managers/StatisticManager.cs @@ -34,7 +34,13 @@ public class StatisticManager : MonoBehaviour public void UpdateData() { - shootAccuracy = (shootAccuracy + ((float) weapons.GetHitCount() / weapons.GetTotalShootCount())) / 2; + float accuracy = (float) weapons.GetHitCount() / weapons.GetTotalShootCount(); + if (float.IsNaN(accuracy)) + { + accuracy = 0f; + } + + shootAccuracy = (shootAccuracy + accuracy) / 2; distanceTravelled = distanceTravelled + playerMovement.GetDistanceTravelled(); playTime = playTime + sceneStopwatch.GetElapsedTime(); enemiesKilled = enemiesKilled + EnemyHealth.deathCount;