diff --git a/Assets/DistanceScript.cs b/Assets/DistanceScript.cs
deleted file mode 100644
index e08e4e9e0b7bdd8191a6bd824183819d27e3021a..0000000000000000000000000000000000000000
--- a/Assets/DistanceScript.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// using System.Collections;
-// using System.Collections.Generic;
-// using UnityEngine;
-
-// public class DistanceScript : MonoBehaviour
-// {
-// public GameObject StartPos;
-// public TextMeshPro scoreText;
-// public GameObject scoreTextObject;
-
-// private float distance;
-
-// // Start is called before the first frame update
-// void Start()
-// {
-// scoreText = scoreTextObject.GetComponent<TextMeshPro>();
-// }
-
-// // Update is called once per frame
-// void Update()
-// {
-// distance = (StartPos.transform.position.X + this.transform.position.X);
-// scoreText = distance.ToString("F1") + "M";
-// }
-// }
diff --git a/Assets/DistanceScript.cs.meta b/Assets/DistanceScript.cs.meta
deleted file mode 100644
index e08e0d19b61efb7859969ffedbd9145cc6053fd2..0000000000000000000000000000000000000000
--- a/Assets/DistanceScript.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1131dc7fc2f4fca4ab156b7ec4732020
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity
index 1200f784e6a5957f96396e8db0e30c1492d70ffb..c64383738e18a96851bca0fe93a164734e9ccfab 100644
--- a/Assets/Scenes/Level01.unity
+++ b/Assets/Scenes/Level01.unity
@@ -15102,103 +15102,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 0.47538227, y: 1.7488923, z: 0.45545995}
m_Center: {x: 0.6942558, y: 0.0026117912, z: -0.0072852913}
---- !u!1001 &1847853332
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_SizeDelta.x
- value: 200
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_SizeDelta.y
- value: 50
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 20
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 155
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 243333824829638858, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5023658776569483927, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
- propertyPath: m_Name
- value: ShotAccuracyText
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 9266beedda7b1cc488a20f1a21ea96bd, type: 3}
--- !u!1 &1862892887
GameObject:
m_ObjectHideFlags: 0
@@ -17584,4 +17487,3 @@ SceneRoots:
- {fileID: 307935225}
- {fileID: 840882477}
- {fileID: 1043811713}
- - {fileID: 1847853332}
diff --git a/Assets/Scripts/Managers/StatisticsCanvasManager.cs b/Assets/Scripts/Managers/StatisticsCanvasManager.cs
index 0b5482d0a700446c667fb75f0966b5f097d06ebf..0d29843f5e174b04906bd6a18e94bfcd7e32e985 100644
--- a/Assets/Scripts/Managers/StatisticsCanvasManager.cs
+++ b/Assets/Scripts/Managers/StatisticsCanvasManager.cs
@@ -6,17 +6,17 @@ using UnityEngine.UI;
namespace Nightmare {
- public class StatisticsCanvasManager : MonoBehaviour
- {
- public TMP_Text shootAccuracyText;
+public class StatisticsCanvasManager : MonoBehaviour
+{
+ public TMP_Text shootAccuracyText;
- public void GetShootAccuracy()
- {
- int _receivedShootInTarget = PlayerShooting._shootInTarget;
- int _receveidShootOutTarget = PlayerShooting._shootOutTarget;
- int _shootAccuracy = (_receivedShootInTarget / _receveidShootOutTarget) * 100;
- shootAccuracyText.text = _shootAccuracy.ToString();
- }
+ public void GetShootAccuracy()
+ {
+ int _receivedShootInTarget = PlayerShooting._shootInTarget;
+ int _receveidShootOutTarget = PlayerShooting._shootOutTarget;
+ int _shootAccuracy = (_receivedShootInTarget / _receveidShootOutTarget) * 100;
+ shootAccuracyText.text = _shootAccuracy.ToString();
+ }
- }
+}
}
diff --git a/Assets/Scripts/Statistics/ShotAccuracyText.prefab b/Assets/Scripts/Statistics/ShotAccuracyText.prefab
index aa3b5ab4d81f2ab4cc474f7d46464fe188e45084..a5b1ff3f85c0e00317ff9436be9be7f8798f63f1 100644
--- a/Assets/Scripts/Statistics/ShotAccuracyText.prefab
+++ b/Assets/Scripts/Statistics/ShotAccuracyText.prefab
@@ -35,7 +35,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 20, y: 155}
- m_SizeDelta: {x: 400, y: 50}
+ m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8608711871479470980
CanvasRenderer:
@@ -65,7 +65,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 'Shot accuracy : '
+ m_text: 'Score : '
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset
index 493caf86e7299807dd1f543d6b3c0def46c34fdb..c09b27fb65a013079320225dfcc5b16e48342552 100644
--- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset
+++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset
@@ -826,36 +826,6 @@ MonoBehaviour:
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- - m_Index: 47
- m_Metrics:
- m_Width: 76.53125
- m_Height: 107.6875
- m_HorizontalBearingX: 7.40625
- m_HorizontalBearingY: 115.203125
- m_HorizontalAdvance: 88.15625
- m_GlyphRect:
- m_X: 305
- m_Y: 661
- m_Width: 77
- m_Height: 109
- m_Scale: 1
- m_AtlasIndex: 0
- m_ClassDefinitionType: 0
- - m_Index: 89
- m_Metrics:
- m_Width: 76.53125
- m_Height: 107.6875
- m_HorizontalBearingX: 7.40625
- m_HorizontalBearingY: 115.203125
- m_HorizontalAdvance: 88.15625
- m_GlyphRect:
- m_X: 305
- m_Y: 791
- m_Width: 77
- m_Height: 109
- m_Scale: 1
- m_AtlasIndex: 0
- m_ClassDefinitionType: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 32
@@ -1037,14 +1007,6 @@ MonoBehaviour:
m_Unicode: 124
m_GlyphIndex: 95
m_Scale: 1
- - m_ElementType: 1
- m_Unicode: 76
- m_GlyphIndex: 47
- m_Scale: 1
- - m_ElementType: 1
- m_Unicode: 118
- m_GlyphIndex: 89
- m_Scale: 1
m_AtlasTextures:
- {fileID: 28981121099961358}
m_AtlasTextureIndex: 0
@@ -1227,14 +1189,6 @@ MonoBehaviour:
m_Y: 520
m_Width: 98
m_Height: 130
- - m_X: 294
- m_Y: 650
- m_Width: 98
- m_Height: 130
- - m_X: 294
- m_Y: 780
- m_Width: 98
- m_Height: 130
m_FreeGlyphRects:
- m_X: 98
m_Y: 130
@@ -1269,9 +1223,9 @@ MonoBehaviour:
m_Width: 31
m_Height: 36
- m_X: 294
- m_Y: 910
+ m_Y: 650
m_Width: 729
- m_Height: 113
+ m_Height: 373
m_fontInfo:
Name: Electronic Highway Sign
PointSize: 144