Big refactor to separate out level1 concerns and switch to event system

SussexPsychologySoftware · Nov 19, 2024 · 8770584 · 8770584
1 parent db7e93d
commit 8770584
Show file tree

Hide file tree

Showing 42 changed files with 539 additions and 443 deletions.
diff --git a/.idea/.idea.Doggo-Nogo/.idea/workspace.xml b/.idea/.idea.Doggo-Nogo/.idea/workspace.xml
diff --git a/Assets/Scripts/Views/UI/Components.meta → Assets/Resources.meta b/Assets/Scripts/Views/UI/Components.meta → Assets/Resources.meta
diff --git a/Assets/Resources/Prefabs.meta b/Assets/Resources/Prefabs.meta
diff --git a/Assets/Resources/Prefabs/GameManager.prefab b/Assets/Resources/Prefabs/GameManager.prefab
diff --git a/Assets/Resources/Prefabs/GameManager.prefab.meta b/Assets/Resources/Prefabs/GameManager.prefab.meta
diff --git a/Assets/Scenes/Simple RT.unity b/Assets/Scenes/Simple RT.unity
diff --git a/Assets/Scripts/Controllers/EndGame/EndGameController.cs b/Assets/Scripts/Controllers/EndGame/EndGameController.cs
@@ -9,7 +9,7 @@ public class EndGameController : MonoBehaviour
 
     private void Awake()
     {
-        if (Instance != null)
+        if (Instance)
         {
             Destroy(gameObject);
             return;
@@ -22,12 +22,11 @@ private void Awake()
     private void InitializeEndGame()
     {
         _scoreData = new EndGameScoreData();
-        GameController.Instance.OnLevelComplete();
     }
 
     public float CalculatePercentileScore()
     {
-        double threshold = GameController.Instance.GetCurrentThreshold();
+        double threshold = DataController.Instance.GetCurrentThreshold();
         return (float)MathUtils.CalculatePercentileNormCDF(threshold);
     }
 }