From 59c928f16b874c3aacf7d3c4dd757ab282a62827 Mon Sep 17 00:00:00 2001 From: blank3times <105398129+blank3times@users.noreply.github.com> Date: Sat, 20 Jan 2024 23:14:22 -0800 Subject: [PATCH 1/2] Update AirRally.cs Replace references to 'noon' with 'twilight' --- Assets/Scripts/Games/AirRally/AirRally.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/Scripts/Games/AirRally/AirRally.cs b/Assets/Scripts/Games/AirRally/AirRally.cs index efc5df19..da5b2b9b 100644 --- a/Assets/Scripts/Games/AirRally/AirRally.cs +++ b/Assets/Scripts/Games/AirRally/AirRally.cs @@ -141,7 +141,7 @@ namespace HeavenStudio.Games.Loaders parameters = new List() { new Param("start", AirRally.DayNightCycle.Day, "Start Time", "Set the time of day for the start of the event."), - new Param("end", AirRally.DayNightCycle.Noon, "End Time", "Set the time of day for the end of the event."), + new Param("end", AirRally.DayNightCycle.Twilight, "End Time", "Set the time of day for the end of the event."), new Param("ease", EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.") } }, @@ -337,9 +337,9 @@ namespace HeavenStudio.Games [SerializeField] private Material bgMat; [SerializeField] private Material objectMat; [SerializeField] private Material cloudMat; - [SerializeField] private Color noonColor; + [SerializeField] private Color twilightColor; [SerializeField] private Color nightColor; - [SerializeField] private Color noonColorCloud; + [SerializeField] private Color twilightColorCloud; [SerializeField] private Color nightColorCloud; private DayNightCycle lastTime = DayNightCycle.Day; private DayNightCycle currentTime = DayNightCycle.Day; @@ -684,20 +684,20 @@ namespace HeavenStudio.Games timeEase = ease; objectsColorFrom = lastTime switch { - DayNightCycle.Noon => Color.black, + DayNightCycle.Twilight => Color.black, _ => Color.white, }; objectsColorTo = currentTime switch { - DayNightCycle.Noon => Color.black, + DayNightCycle.Twilight => Color.black, _ => Color.white, }; bgColorFrom = lastTime switch { DayNightCycle.Day => Color.white, - DayNightCycle.Noon => noonColor, + DayNightCycle.Twilight => twilightColor, DayNightCycle.Night => nightColor, _ => throw new System.NotImplementedException() }; @@ -705,7 +705,7 @@ namespace HeavenStudio.Games bgColorTo = currentTime switch { DayNightCycle.Day => Color.white, - DayNightCycle.Noon => noonColor, + DayNightCycle.Twilight => twilightColor, DayNightCycle.Night => nightColor, _ => throw new System.NotImplementedException() }; @@ -713,7 +713,7 @@ namespace HeavenStudio.Games cloudColorFrom = lastTime switch { DayNightCycle.Day => Color.white, - DayNightCycle.Noon => noonColorCloud, + DayNightCycle.Twilight => twilightColorCloud, DayNightCycle.Night => nightColorCloud, _ => throw new System.NotImplementedException() }; @@ -721,7 +721,7 @@ namespace HeavenStudio.Games cloudColorTo = currentTime switch { DayNightCycle.Day => Color.white, - DayNightCycle.Noon => noonColorCloud, + DayNightCycle.Twilight => twilightColorCloud, DayNightCycle.Night => nightColorCloud, _ => throw new System.NotImplementedException() }; @@ -759,7 +759,7 @@ namespace HeavenStudio.Games public enum DayNightCycle { Day = 0, - Noon = 1, + Twilight = 1, Night = 2 } From 8564146d9c05df08ebbb46d8aa826ad3024f3715 Mon Sep 17 00:00:00 2001 From: blank3times <105398129+blank3times@users.noreply.github.com> Date: Sat, 20 Jan 2024 23:15:51 -0800 Subject: [PATCH 2/2] Update DoubleDate.cs Replace references to 'noon' with 'sunset' --- Assets/Scripts/Games/DoubleDate/DoubleDate.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs index 02457f1e..de35b592 100644 --- a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs +++ b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs @@ -79,7 +79,7 @@ namespace HeavenStudio.Games.Loaders defaultLength = 0.5f, parameters = new() { - new("d", DoubleDate.DayTime.Noon, "Time", "Set the time of day.") + new("d", DoubleDate.DayTime.Sunset, "Time", "Set the time of day.") } } }, @@ -123,7 +123,7 @@ namespace HeavenStudio.Games [Header("Variables")] [SerializeField] private Color _skyColor; - [SerializeField] private Color noonColor; + [SerializeField] private Color sunsetColor; [SerializeField] private float _animSpeed = 1.25f; [SerializeField] public float cloudSpeed; [SerializeField] public float cloudDistance; @@ -192,7 +192,7 @@ namespace HeavenStudio.Games public enum DayTime { Day, - Noon + Sunset } private void DayTimeCheck(double beat) @@ -206,9 +206,9 @@ namespace HeavenStudio.Games public void SetTime(int time) { - if (time == (int)DayTime.Noon) + if (time == (int)DayTime.Sunset) { - doubleDateCellAnim.SetColor("_Color", noonColor); + doubleDateCellAnim.SetColor("_Color", sunsetColor); bgSquare.color = squareColor; bgGradient.sprite = bgLong; return; @@ -246,7 +246,7 @@ namespace HeavenStudio.Games { instance = this; SetupBopRegion("doubleDate", "bop", "autoBop"); - doubleDateCellAnim.SetColor("_Color", noonColor); + doubleDateCellAnim.SetColor("_Color", sunsetColor); squareColor = bgSquare.color; } @@ -508,4 +508,4 @@ namespace HeavenStudio.Games return shadow; } } -} \ No newline at end of file +}