etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #648 from blank3times/master 

Fix golden hour time of day settings being labelled "noon"
This commit is contained in:
minenice55 2024-01-21 18:24:17 +00:00 committed by GitHub
parent da73d62ce7 8564146d9c
commit bb4098665d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Scripts/Games/AirRally/AirRally.cs
View File

@ -141,7 +141,7 @@ namespace HeavenStudio.Games.Loaders
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("start", AirRally.DayNightCycle.Day, "Start Time", "Set the time of day for the start of the event."), 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.") 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 bgMat;
[SerializeField] private Material objectMat; [SerializeField] private Material objectMat;
[SerializeField] private Material cloudMat; [SerializeField] private Material cloudMat;
[SerializeField] private Color noonColor; [SerializeField] private Color twilightColor;
[SerializeField] private Color nightColor; [SerializeField] private Color nightColor;
[SerializeField] private Color noonColorCloud; [SerializeField] private Color twilightColorCloud;
[SerializeField] private Color nightColorCloud; [SerializeField] private Color nightColorCloud;
private DayNightCycle lastTime = DayNightCycle.Day; private DayNightCycle lastTime = DayNightCycle.Day;
private DayNightCycle currentTime = DayNightCycle.Day; private DayNightCycle currentTime = DayNightCycle.Day;
@ -684,20 +684,20 @@ namespace HeavenStudio.Games
timeEase = ease; timeEase = ease;
objectsColorFrom = lastTime switch objectsColorFrom = lastTime switch
{ {
DayNightCycle.Noon => Color.black, DayNightCycle.Twilight => Color.black,
_ => Color.white, _ => Color.white,
}; };
objectsColorTo = currentTime switch objectsColorTo = currentTime switch
{ {
DayNightCycle.Noon => Color.black, DayNightCycle.Twilight => Color.black,
_ => Color.white, _ => Color.white,
}; };
bgColorFrom = lastTime switch bgColorFrom = lastTime switch
{ {
DayNightCycle.Day => Color.white, DayNightCycle.Day => Color.white,
DayNightCycle.Noon => noonColor, DayNightCycle.Twilight => twilightColor,
DayNightCycle.Night => nightColor, DayNightCycle.Night => nightColor,
_ => throw new System.NotImplementedException() _ => throw new System.NotImplementedException()
}; };
@ -705,7 +705,7 @@ namespace HeavenStudio.Games
bgColorTo = currentTime switch bgColorTo = currentTime switch
{ {
DayNightCycle.Day => Color.white, DayNightCycle.Day => Color.white,
DayNightCycle.Noon => noonColor, DayNightCycle.Twilight => twilightColor,
DayNightCycle.Night => nightColor, DayNightCycle.Night => nightColor,
_ => throw new System.NotImplementedException() _ => throw new System.NotImplementedException()
}; };
@ -713,7 +713,7 @@ namespace HeavenStudio.Games
cloudColorFrom = lastTime switch cloudColorFrom = lastTime switch
{ {
DayNightCycle.Day => Color.white, DayNightCycle.Day => Color.white,
DayNightCycle.Noon => noonColorCloud, DayNightCycle.Twilight => twilightColorCloud,
DayNightCycle.Night => nightColorCloud, DayNightCycle.Night => nightColorCloud,
_ => throw new System.NotImplementedException() _ => throw new System.NotImplementedException()
}; };
@ -721,7 +721,7 @@ namespace HeavenStudio.Games
cloudColorTo = currentTime switch cloudColorTo = currentTime switch
{ {
DayNightCycle.Day => Color.white, DayNightCycle.Day => Color.white,
DayNightCycle.Noon => noonColorCloud, DayNightCycle.Twilight => twilightColorCloud,
DayNightCycle.Night => nightColorCloud, DayNightCycle.Night => nightColorCloud,
_ => throw new System.NotImplementedException() _ => throw new System.NotImplementedException()
}; };
@ -759,7 +759,7 @@ namespace HeavenStudio.Games
public enum DayNightCycle public enum DayNightCycle
{ {
Day = 0, Day = 0,
Noon = 1, Twilight = 1,
Night = 2 Night = 2
} }

12
Assets/Scripts/Games/DoubleDate/DoubleDate.cs
View File

@ -79,7 +79,7 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 0.5f, defaultLength = 0.5f,
parameters = new() 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")] [Header("Variables")]
[SerializeField] private Color _skyColor; [SerializeField] private Color _skyColor;
[SerializeField] private Color noonColor; [SerializeField] private Color sunsetColor;
[SerializeField] private float _animSpeed = 1.25f; [SerializeField] private float _animSpeed = 1.25f;
[SerializeField] public float cloudSpeed; [SerializeField] public float cloudSpeed;
[SerializeField] public float cloudDistance; [SerializeField] public float cloudDistance;
@ -192,7 +192,7 @@ namespace HeavenStudio.Games
public enum DayTime public enum DayTime
{ {
Day, Day,
Noon Sunset
} }
private void DayTimeCheck(double beat) private void DayTimeCheck(double beat)
@ -206,9 +206,9 @@ namespace HeavenStudio.Games
public void SetTime(int time) 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; bgSquare.color = squareColor;
bgGradient.sprite = bgLong; bgGradient.sprite = bgLong;
return; return;
@ -246,7 +246,7 @@ namespace HeavenStudio.Games
{ {
instance = this; instance = this;
SetupBopRegion("doubleDate", "bop", "autoBop"); SetupBopRegion("doubleDate", "bop", "autoBop");
doubleDateCellAnim.SetColor("_Color", noonColor); doubleDateCellAnim.SetColor("_Color", sunsetColor);
squareColor = bgSquare.color; squareColor = bgSquare.color;
} }