diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index a625789cf7017c60d40dffa44fa27f98ee794c54..a16fe22b0351b50e945ebc418cf0152443b14f02 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -2149,7 +2149,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.000046372, y: -51.74} + m_AnchoredPosition: {x: 0.00000011921, y: -110} m_SizeDelta: {x: 359.1251, y: 102.4798} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1406103761 @@ -2206,6 +2206,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86e378bc199fbd343bceabbd3a16d73e, type: 3} m_Name: m_EditorClassIdentifier: + score: {fileID: 1406103761} + level: {fileID: 2086344134} --- !u!1 &1451944811 GameObject: m_ObjectHideFlags: 0 @@ -8598,6 +8600,7 @@ GameObject: - component: {fileID: 2086344133} - component: {fileID: 2086344135} - component: {fileID: 2086344134} + - component: {fileID: 2086344136} m_Layer: 5 m_Name: Level m_TagString: Untagged @@ -8621,8 +8624,8 @@ RectTransform: 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: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -0.0000024909, y: 165.33} + m_SizeDelta: {x: 374.0317, y: 123.8041} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2086344134 MonoBehaviour: @@ -8637,7 +8640,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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 @@ -8645,19 +8648,19 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} + m_FontSize: 44 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 + m_MinSize: 4 + m_MaxSize: 44 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: 'Level : -' --- !u!222 &2086344135 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8666,6 +8669,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086344132} m_CullTransparentMesh: 1 +--- !u!114 &2086344136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086344132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86e378bc199fbd343bceabbd3a16d73e, type: 3} + m_Name: + m_EditorClassIdentifier: + score: {fileID: 1406103761} + level: {fileID: 2086344134} --- !u!1 &2136713438 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/ScoreManager.cs b/Assets/Scripts/Managers/ScoreManager.cs index 55b37419649831e4375ccb669c55903233cd78d2..e18286bdda9d1352f6f455dc289bb964d87618d8 100644 --- a/Assets/Scripts/Managers/ScoreManager.cs +++ b/Assets/Scripts/Managers/ScoreManager.cs @@ -12,15 +12,14 @@ public class ScoreManager : MonoBehaviour public static bool isScoreOver = false; - Text text; + public Text score; + public Text level; void Start () { - text = GetComponent <Text> (); zenScore = 0; waveScore = 0; - Debug.Log(text); } void Update () @@ -30,12 +29,14 @@ public class ScoreManager : MonoBehaviour if (!isScoreOver) { zenScore += Time.deltaTime * multiplier; finalScore = (int) zenScore; - text.text = "Score: " + String.Format("{0:0}",zenScore); + score.text = "Score: " + String.Format("{0:0}",zenScore); } else { - text.text = "Score: " + String.Format("{0:0}",zenScore); + score.text = "Score: " + String.Format("{0:0}",zenScore); } + level.text = ""; } else { - text.text = "Score: " + waveScore; + score.text = "Score: " + waveScore; + level.text = "Level: " + EnemyManager.waveLevel; } }