From ccdaa1565362da26f025f99641c661414cd952ab Mon Sep 17 00:00:00 2001 From: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com> Date: Thu, 12 Feb 2026 16:22:37 +0000 Subject: [PATCH 1/9] set y distance between stars to meet sampling --- .../Assets/Scenes/StarCollector.unity | 113 +++++++++++++++++- .../Scripts/StarCollector/StarGenerator.cs | 15 ++- 2 files changed, 118 insertions(+), 10 deletions(-) diff --git a/projects/AstroBalance/Assets/Scenes/StarCollector.unity b/projects/AstroBalance/Assets/Scenes/StarCollector.unity index d301d251..f1a19f0c 100644 --- a/projects/AstroBalance/Assets/Scenes/StarCollector.unity +++ b/projects/AstroBalance/Assets/Scenes/StarCollector.unity @@ -463,6 +463,103 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1034761066} m_CullTransparentMesh: 1 +--- !u!1001 &1178398765 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2095903232} + m_Modifications: + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 145 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 222 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3963520631102135163, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_Name + value: Head Pose Debugger + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} --- !u!1001 &1260672149 PrefabInstance: m_ObjectHideFlags: 0 @@ -603,12 +700,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a7165a8b1c6e77848a390216111a1fab, type: 3} m_Name: m_EditorClassIdentifier: - baseStarSpeed: 3 - maxStarSpeed: 10 - minStarSpeed: 2 + baseStarSpeed: 5 + maxStarSpeed: 5 + minStarSpeed: 5 speedIncrement: 1 - starCreationDistance: 2.5 - swerve: 0.1 + starSampling: 10 + swerve: 0.8 waveWidth: 3 starPrefab: {fileID: 7594402928058972626, guid: f672f33e77ac96d40a106fe9e6adae33, type: 3} --- !u!4 &1755869805 @@ -626,6 +723,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &1761357956 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3060515120221018932, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + m_PrefabInstance: {fileID: 1178398765} + m_PrefabAsset: {fileID: 0} --- !u!1 &1839649831 GameObject: m_ObjectHideFlags: 0 @@ -1094,6 +1196,7 @@ RectTransform: - {fileID: 2037884791} - {fileID: 1898818218} - {fileID: 1260672150} + - {fileID: 1761357956} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs index 91495668..cd360f05 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs @@ -2,13 +2,13 @@ public class StarGenerator : MonoBehaviour { - [SerializeField, Tooltip("Default speed of generated stars")] + [SerializeField, Tooltip("Default speed of generated stars (unity units / second)")] public float baseStarSpeed = 3f; - [SerializeField, Tooltip("Maximum speed of generated stars")] + [SerializeField, Tooltip("Maximum speed of generated stars (unity units / second)")] private float maxStarSpeed = 10f; - [SerializeField, Tooltip("Minimum speed of generated stars")] + [SerializeField, Tooltip("Minimum speed of generated stars (unity units / second)")] private float minStarSpeed = 2f; [ @@ -17,8 +17,8 @@ public class StarGenerator : MonoBehaviour ] private float speedIncrement = 1f; - [SerializeField, Tooltip("Distance between generated stars on the y axis")] - private float starCreationDistance = 2.5f; + [SerializeField, Tooltip("Number of stars to spawn per cycle of the wave")] + private float starSampling = 10f; [ SerializeField, @@ -35,11 +35,16 @@ public class StarGenerator : MonoBehaviour private float pathDistance = 15f; private float frontier = 0; private float d_eff; + private float starCreationDistance; // y distance between spawned stars private bool isGenerating = true; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { + // Calculate y distance between stars so there are 'starSampling' stars per cycle + float yWavelength = (2 * Mathf.PI) / swerve; + starCreationDistance = yWavelength / starSampling; + InitStars(); } From 2cc990a8d024d7e0a37522e5527e069b1d44ddae Mon Sep 17 00:00:00 2001 From: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com> Date: Fri, 13 Feb 2026 09:25:01 +0000 Subject: [PATCH 2/9] increase star speed and make wave tighter --- .../Assets/Scenes/StarCollector.unity | 12 ++++++------ .../Assets/Scripts/StarCollector/Star.cs | 2 +- .../StarCollector/StarCollectorManager.cs | 2 -- .../Scripts/StarCollector/StarGenerator.cs | 19 ++++++++++++++----- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/projects/AstroBalance/Assets/Scenes/StarCollector.unity b/projects/AstroBalance/Assets/Scenes/StarCollector.unity index 164b6e07..dae53721 100644 --- a/projects/AstroBalance/Assets/Scenes/StarCollector.unity +++ b/projects/AstroBalance/Assets/Scenes/StarCollector.unity @@ -700,11 +700,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a7165a8b1c6e77848a390216111a1fab, type: 3} m_Name: m_EditorClassIdentifier: - baseStarSpeed: 5 - maxStarSpeed: 5 - minStarSpeed: 5 - speedIncrement: 1 - starSampling: 10 + baseStarSpeed: 4 + maxStarSpeed: 10 + minStarSpeed: 2 + speedIncrement: 0.5 + starSampling: 8 swerve: 0.8 waveWidth: 3 starPrefab: {fileID: 7594402928058972626, guid: f672f33e77ac96d40a106fe9e6adae33, type: 3} @@ -996,7 +996,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8540260659054522905, guid: af69df94eeb1b0846a7483685cb30d44, type: 3} propertyPath: m_AnchoredPosition.y - value: 59.609314 + value: 59.609375 objectReference: {fileID: 0} - target: {fileID: 8540260659054522905, guid: af69df94eeb1b0846a7483685cb30d44, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/Star.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/Star.cs index 1acd9740..0dde7501 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/Star.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/Star.cs @@ -22,7 +22,7 @@ void Update() var pos = transform.position; transform.position = new Vector3( pos.x, - pos.y - starGenerator.baseStarSpeed * Time.deltaTime, + pos.y - starGenerator.GetStarSpeed() * Time.deltaTime, pos.z ); diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs index e500ea63..279585db 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs @@ -115,12 +115,10 @@ private void UpdateDifficulty() if (percentCollected > speedUpgradePercent) { - Debug.Log("Increasing difficulty"); starGenerator.IncreaseSpeed(); } else { - Debug.Log("Decreasing difficulty"); starGenerator.DecreaseSpeed(); } diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs index cd360f05..3a0807a2 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarGenerator.cs @@ -3,7 +3,7 @@ public class StarGenerator : MonoBehaviour { [SerializeField, Tooltip("Default speed of generated stars (unity units / second)")] - public float baseStarSpeed = 3f; + public float baseStarSpeed = 4f; [SerializeField, Tooltip("Maximum speed of generated stars (unity units / second)")] private float maxStarSpeed = 10f; @@ -13,18 +13,20 @@ public class StarGenerator : MonoBehaviour [ SerializeField, - Tooltip("Speed increment used when dynamically increasing or decreasing star speed") + Tooltip( + "Speed increment used when dynamically increasing or decreasing star speed (unity units / second)" + ) ] - private float speedIncrement = 1f; + private float speedIncrement = 0.5f; [SerializeField, Tooltip("Number of stars to spawn per cycle of the wave")] - private float starSampling = 10f; + private float starSampling = 8f; [ SerializeField, Tooltip("Higher swerve generates a wave that oscillates from left to right more often") ] - private float swerve = 0.1f; + private float swerve = 0.8f; [SerializeField, Tooltip("Width of the generated wave of stars on the x axis")] private float waveWidth = 3f; @@ -80,6 +82,11 @@ public void DecreaseSpeed() UpdateSpeed(-speedIncrement); } + public float GetStarSpeed() + { + return baseStarSpeed; + } + private void UpdateSpeed(float increment) { float nextSpeed = baseStarSpeed + increment; @@ -95,6 +102,8 @@ private void UpdateSpeed(float increment) { baseStarSpeed = nextSpeed; } + + Debug.Log($"Updated star speed to {nextSpeed}"); } public void StopGeneration() From adca28d89b534f277de51bceca1fda05191e12a4 Mon Sep 17 00:00:00 2001 From: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com> Date: Fri, 13 Feb 2026 09:40:01 +0000 Subject: [PATCH 3/9] make time limit increase configurable and add win streaks --- .../Assets/Scenes/StarCollector.unity | 8 ++- .../StarCollector/StarCollectorManager.cs | 70 +++++++++++++++---- 2 files changed, 63 insertions(+), 15 deletions(-) diff --git a/projects/AstroBalance/Assets/Scenes/StarCollector.unity b/projects/AstroBalance/Assets/Scenes/StarCollector.unity index dae53721..42efe0af 100644 --- a/projects/AstroBalance/Assets/Scenes/StarCollector.unity +++ b/projects/AstroBalance/Assets/Scenes/StarCollector.unity @@ -370,6 +370,8 @@ MonoBehaviour: starGenerator: {fileID: 1755869804} minTimeLimit: 60 maxTimeLimit: 180 + timeLimitIncrement: 30 + nGamesToUpgrade: 3 difficultyWindowSeconds: 10 speedUpgradePercent: 60 timeLimitUpgradePercent: 60 @@ -555,6 +557,10 @@ PrefabInstance: propertyPath: m_Name value: Head Pose Debugger objectReference: {fileID: 0} + - target: {fileID: 3963520631102135163, guid: 61125f32186bebb4aadc71f1810d8ebd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1195,8 +1201,8 @@ RectTransform: - {fileID: 1839649832} - {fileID: 2037884791} - {fileID: 1898818218} - - {fileID: 1260672150} - {fileID: 1761357956} + - {fileID: 1260672150} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs index 279585db..65c55e5b 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Linq; using TMPro; using UnityEngine; @@ -21,6 +23,17 @@ public class StarCollectorManager : MonoBehaviour [SerializeField, Tooltip("Maximum game time limit in seconds")] private int maxTimeLimit = 180; + [SerializeField, Tooltip("Time limit increase if timeLimitUpgradePercent is met")] + private int timeLimitIncrement = 30; + + [ + SerializeField, + Tooltip( + "Number of games in a row that must meet timeLimitUpgradePercent to increase the time limit" + ) + ] + private int nGamesToUpgrade = 3; + [SerializeField, Tooltip("Length of time window (in seconds) to evaluate player perfomance")] private int difficultyWindowSeconds = 10; @@ -51,32 +64,61 @@ public class StarCollectorManager : MonoBehaviour // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { + ChooseGameTimeLimit(); + winText = winScreen.GetComponentInChildren(); + gameData = new StarCollectorData(); + score = 0; + scoreText.text = score.ToString(); + timer.StartCountdown(timeLimit); - // Load last game data (if any) from file + choose time limit for this game + windowStart = Time.time; + } + + /// + /// Load previous game data (if any), and choose time limit for this game based + /// on prior perfomance. + /// + private void ChooseGameTimeLimit() + { SaveData saveData = new(saveFilename); - StarCollectorData lastGameData = saveData.GetLastGameData(); + IEnumerable lastNGamesData = saveData.GetLastNGamesData(nGamesToUpgrade); - if (lastGameData == null) + if (lastNGamesData.Count() < nGamesToUpgrade) { SetTimeLimit(minTimeLimit); + return; } - else if (lastGameData.percentStarsCollected > timeLimitUpgradePercent) + + // Upgrade if all the last n games have the same time limit + meet the upgrade + // percent. If it's a mix of time limits, then we haven't played enough games at + // this level yet to progress. + int nGamesAtUpgradePercent = 0; + bool allSameTimeLimit = true; + int lastTimeLimit = lastNGamesData.Last().timeLimitSeconds; + + foreach (StarCollectorData data in lastNGamesData) + { + if (data.timeLimitSeconds != lastTimeLimit) + { + allSameTimeLimit = false; + break; + } + + if (data.percentStarsCollected > timeLimitUpgradePercent) + { + nGamesAtUpgradePercent++; + } + } + + if (allSameTimeLimit && nGamesAtUpgradePercent >= nGamesToUpgrade) { - // Increase time limit by 30 seconds vs last game - SetTimeLimit(lastGameData.timeLimitSeconds + 30); + SetTimeLimit(lastTimeLimit + timeLimitIncrement); } else { - SetTimeLimit(lastGameData.timeLimitSeconds); + SetTimeLimit(lastTimeLimit); } - - gameData = new StarCollectorData(); - score = 0; - scoreText.text = score.ToString(); - timer.StartCountdown(timeLimit); - - windowStart = Time.time; } // Update is called once per frame From f899c7a58c289ef6512a8dddfccacaba3fb3c1ca Mon Sep 17 00:00:00 2001 From: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com> Date: Fri, 13 Feb 2026 09:46:43 +0000 Subject: [PATCH 4/9] update time limit increment defaults --- projects/AstroBalance/Assets/Scenes/StarCollector.unity | 2 +- .../Assets/Scripts/StarCollector/StarCollectorManager.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/AstroBalance/Assets/Scenes/StarCollector.unity b/projects/AstroBalance/Assets/Scenes/StarCollector.unity index 42efe0af..cd6c763f 100644 --- a/projects/AstroBalance/Assets/Scenes/StarCollector.unity +++ b/projects/AstroBalance/Assets/Scenes/StarCollector.unity @@ -370,7 +370,7 @@ MonoBehaviour: starGenerator: {fileID: 1755869804} minTimeLimit: 60 maxTimeLimit: 180 - timeLimitIncrement: 30 + timeLimitIncrement: 60 nGamesToUpgrade: 3 difficultyWindowSeconds: 10 speedUpgradePercent: 60 diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs index 65c55e5b..9d280331 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs @@ -24,7 +24,7 @@ public class StarCollectorManager : MonoBehaviour private int maxTimeLimit = 180; [SerializeField, Tooltip("Time limit increase if timeLimitUpgradePercent is met")] - private int timeLimitIncrement = 30; + private int timeLimitIncrement = 60; [ SerializeField, From 77467e17e91570206234d1ad7d0bbd80dc61aaab Mon Sep 17 00:00:00 2001 From: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com> Date: Fri, 13 Feb 2026 10:31:26 +0000 Subject: [PATCH 5/9] update star collector docs --- docs/star-collector.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/star-collector.md b/docs/star-collector.md index c376bcd0..7632642f 100644 --- a/docs/star-collector.md +++ b/docs/star-collector.md @@ -6,14 +6,16 @@ top of the screen. ## Main objects / values to edit during play testing - **StarCollectorManager**: values related to the overall win condition of the game - - Min / max time limit - - The % of stars that must be collected to increase speed or time limit + - Min / max time limit in seconds + - Time limit increment in seconds (if time limit upgrade % is met) + - Number of games in a row that must meet the upgrade % to increase the time limit - The length of the time window used to evaluate player performance - + - The % of stars that must be collected to increase speed or time limit + - **StarGenerator**: values related to generation of the wave of stars - - Min / max star speed + - Min, max and base star speed - The amount the star speed increases per upgrade - - Shape of the wave (e.g. width, distance between stars...) + - Shape of the wave (e.g. width, swerve, star sampling) - **Ship**: values related to ship movement - The amount the ship moves per degree of head movement (X By Degrees) \ No newline at end of file From 60f25fbb40bca96499e2d57c2f8033e23654cfb9 Mon Sep 17 00:00:00 2001 From: Stephen Thompson Date: Wed, 4 Mar 2026 14:23:18 +0000 Subject: [PATCH 6/9] Remove unused child from star collector scene. --- projects/AstroBalance/Assets/Scenes/StarCollector.unity | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/AstroBalance/Assets/Scenes/StarCollector.unity b/projects/AstroBalance/Assets/Scenes/StarCollector.unity index 3f94b194..54458524 100644 --- a/projects/AstroBalance/Assets/Scenes/StarCollector.unity +++ b/projects/AstroBalance/Assets/Scenes/StarCollector.unity @@ -1313,7 +1313,6 @@ RectTransform: m_Children: - {fileID: 1839649832} - {fileID: 1898818218} - - {fileID: 1761357956} - {fileID: 1260672150} - {fileID: 1932805937} m_Father: {fileID: 0} From 5ff5b61312b4cb0b6701ccb8f34175202982d57b Mon Sep 17 00:00:00 2001 From: Stephen Thompson Date: Tue, 31 Mar 2026 13:56:50 +0100 Subject: [PATCH 7/9] Fixed merge conflict --- .../Assets/Scripts/StarCollector/StarCollectorManager.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs index 63d1c38e..9d280331 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs @@ -82,11 +82,7 @@ void Start() private void ChooseGameTimeLimit() { SaveData saveData = new(saveFilename); -<<<<<<< km/star-collector-updates IEnumerable lastNGamesData = saveData.GetLastNGamesData(nGamesToUpgrade); -======= - StarCollectorData lastGameData = saveData.GetLastCompleteGameData(); ->>>>>>> main if (lastNGamesData.Count() < nGamesToUpgrade) { From 941994b439ffd514d42248369d21bf55ce071d33 Mon Sep 17 00:00:00 2001 From: Stephen Thompson Date: Tue, 31 Mar 2026 14:01:44 +0100 Subject: [PATCH 8/9] Fix function name --- .../Assets/Scripts/StarCollector/StarCollectorManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs index 9d280331..c9d89732 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs @@ -82,7 +82,7 @@ void Start() private void ChooseGameTimeLimit() { SaveData saveData = new(saveFilename); - IEnumerable lastNGamesData = saveData.GetLastNGamesData(nGamesToUpgrade); + IEnumerable lastNGamesData = saveData.GetLastNCompleteGamesData(nGamesToUpgrade); if (lastNGamesData.Count() < nGamesToUpgrade) { From 3021aefd390aeb2584db327527f9498bff754209 Mon Sep 17 00:00:00 2001 From: Stephen Thompson Date: Tue, 31 Mar 2026 14:04:11 +0100 Subject: [PATCH 9/9] Fix format --- .../Assets/Scripts/StarCollector/StarCollectorManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs index c9d89732..3972c86b 100644 --- a/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs +++ b/projects/AstroBalance/Assets/Scripts/StarCollector/StarCollectorManager.cs @@ -82,7 +82,9 @@ void Start() private void ChooseGameTimeLimit() { SaveData saveData = new(saveFilename); - IEnumerable lastNGamesData = saveData.GetLastNCompleteGamesData(nGamesToUpgrade); + IEnumerable lastNGamesData = saveData.GetLastNCompleteGamesData( + nGamesToUpgrade + ); if (lastNGamesData.Count() < nGamesToUpgrade) {