From 6ee784bf4ed964146cf871ccfae1465eee0557cc Mon Sep 17 00:00:00 2001 From: Pasha Bibko <156938226+PashaBibko@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:08:04 +0000 Subject: [PATCH] Added high score Also made player always render on top of enemies --- Assets/Materials/{RedMat.mat => BlackMat.mat} | 2 +- .../Materials/{RedMat.mat.meta => BlackMat.mat.meta} | 0 Assets/Prefabs/Enemy.prefab | 2 +- Assets/Scripts/EnemyController.cs | 2 +- Assets/Scripts/OrbitalPosition.cs | 2 +- Assets/Scripts/PlayerController.cs | 11 ++++++++--- 6 files changed, 12 insertions(+), 7 deletions(-) rename Assets/Materials/{RedMat.mat => BlackMat.mat} (99%) rename Assets/Materials/{RedMat.mat.meta => BlackMat.mat.meta} (100%) diff --git a/Assets/Materials/RedMat.mat b/Assets/Materials/BlackMat.mat similarity index 99% rename from Assets/Materials/RedMat.mat rename to Assets/Materials/BlackMat.mat index 35388d6..3c41e63 100644 --- a/Assets/Materials/RedMat.mat +++ b/Assets/Materials/BlackMat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RedMat + m_Name: BlackMat m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/RedMat.mat.meta b/Assets/Materials/BlackMat.mat.meta similarity index 100% rename from Assets/Materials/RedMat.mat.meta rename to Assets/Materials/BlackMat.mat.meta diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index fd90696..fd58dd7 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -80,7 +80,7 @@ Transform: m_GameObject: {fileID: 4804673878835712602} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/EnemyController.cs b/Assets/Scripts/EnemyController.cs index 152fd54..ddb3afa 100644 --- a/Assets/Scripts/EnemyController.cs +++ b/Assets/Scripts/EnemyController.cs @@ -14,7 +14,7 @@ public class EnemyController : OrbitalPositionBehaviour public override void OnReachCentre() { if (GlobalOrbitalPositionManager.IsSimulationRunning) - PlayerController.PlayerScore++; + PlayerController.s_PlayerScore++; Destroy(gameObject); } diff --git a/Assets/Scripts/OrbitalPosition.cs b/Assets/Scripts/OrbitalPosition.cs index 5c82f31..96bf7c9 100644 --- a/Assets/Scripts/OrbitalPosition.cs +++ b/Assets/Scripts/OrbitalPosition.cs @@ -155,7 +155,7 @@ public class GlobalOrbitalPositionManager : MonoBehaviour if (ring.transform.localScale.x < 0.5f) { if (IsSimulationRunning) - PlayerController.PlayerScore++; + PlayerController.s_PlayerScore++; toRemove.Add(ring); } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 1c43ee5..24a8d55 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -1,9 +1,11 @@ +using System; using UnityEngine; using UnityEngine.UI; public class PlayerController : OrbitalPositionBehaviour { - public static int PlayerScore = 0; + public static int s_PlayerScore; + private static int s_HighScore = 20; private static PlayerController s_Instance; public static bool IsPlayerAttached => s_Instance.m_OrbitalPosition.m_IsAttachedToRings; @@ -28,7 +30,9 @@ public class PlayerController : OrbitalPositionBehaviour public void Update() { - m_ScoreText.text = PlayerScore.ToString(); + m_ScoreText.text = s_PlayerScore.ToString(); + if (s_PlayerScore > s_HighScore) + m_ScoreText.color = Color.yellow; if (GlobalInput.IsScreenClicked() && GlobalOrbitalPositionManager.AllowPlayerInput) { @@ -60,7 +64,8 @@ public class PlayerController : OrbitalPositionBehaviour m_Renderer.material.color = Color.green; - PlayerScore = 0; + s_HighScore = Math.Max(s_HighScore, s_PlayerScore); + s_PlayerScore = 0; } public override void OnReachCentre()