mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #648 from blank3times/master"

Browse source 
This reverts commit 8507439e0e, reversing
changes made to 5e63a5898a.
This commit is contained in:
minenice55 2024-01-21 19:15:28 -05:00
parent 197e5daa14
commit 5cf8422457
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>()
{
new Param("start", AirRally.DayNightCycle.Day, "Start Time", "Set the time of day for the start of the event."),
new Param("end", AirRally.DayNightCycle.Twilight, "End Time", "Set the time of day for the end of the event."),
new Param("end", AirRally.DayNightCycle.Noon, "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 twilightColor;
[SerializeField] private Color noonColor;
[SerializeField] private Color nightColor;
[SerializeField] private Color twilightColorCloud;
[SerializeField] private Color noonColorCloud;
[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.Twilight => Color.black,
DayNightCycle.Noon => Color.black,
_ => Color.white,
};
objectsColorTo = currentTime switch
{
DayNightCycle.Twilight => Color.black,
DayNightCycle.Noon => Color.black,
_ => Color.white,
};
bgColorFrom = lastTime switch
{
DayNightCycle.Day => Color.white,
DayNightCycle.Twilight => twilightColor,
DayNightCycle.Noon => noonColor,
DayNightCycle.Night => nightColor,
_ => throw new System.NotImplementedException()
};
@ -705,7 +705,7 @@ namespace HeavenStudio.Games
bgColorTo = currentTime switch
{
DayNightCycle.Day => Color.white,
DayNightCycle.Twilight => twilightColor,
DayNightCycle.Noon => noonColor,
DayNightCycle.Night => nightColor,
_ => throw new System.NotImplementedException()
};
@ -713,7 +713,7 @@ namespace HeavenStudio.Games
cloudColorFrom = lastTime switch
{
DayNightCycle.Day => Color.white,
DayNightCycle.Twilight => twilightColorCloud,
DayNightCycle.Noon => noonColorCloud,
DayNightCycle.Night => nightColorCloud,
_ => throw new System.NotImplementedException()
};
@ -721,7 +721,7 @@ namespace HeavenStudio.Games
cloudColorTo = currentTime switch
{
DayNightCycle.Day => Color.white,
DayNightCycle.Twilight => twilightColorCloud,
DayNightCycle.Noon => noonColorCloud,
DayNightCycle.Night => nightColorCloud,
_ => throw new System.NotImplementedException()
};
@ -759,7 +759,7 @@ namespace HeavenStudio.Games
public enum DayNightCycle
{
Day = 0,
Twilight = 1,
Noon = 1,
Night = 2
}

14
Assets/Scripts/Games/DoubleDate/DoubleDate.cs
View file

@ -79,7 +79,7 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 0.5f,
parameters = new()
{
new("d", DoubleDate.DayTime.Sunset, "Time", "Set the time of day.")
new("d", DoubleDate.DayTime.Noon, "Time", "Set the time of day.")
}
}
},
@ -123,7 +123,7 @@ namespace HeavenStudio.Games
[Header("Variables")]
[SerializeField] private Color _skyColor;
[SerializeField] private Color sunsetColor;
[SerializeField] private Color noonColor;
[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,
Sunset
Noon
}
private void DayTimeCheck(double beat)
@ -206,9 +206,9 @@ namespace HeavenStudio.Games
public void SetTime(int time)
{
if (time == (int)DayTime.Sunset)
if (time == (int)DayTime.Noon)
{
doubleDateCellAnim.SetColor("_Color", sunsetColor);
doubleDateCellAnim.SetColor("_Color", noonColor);
bgSquare.color = squareColor;
bgGradient.sprite = bgLong;
return;
@ -246,7 +246,7 @@ namespace HeavenStudio.Games
{
instance = this;
SetupBopRegion("doubleDate", "bop", "autoBop");
doubleDateCellAnim.SetColor("_Color", sunsetColor);
doubleDateCellAnim.SetColor("_Color", noonColor);
squareColor = bgSquare.color;
}
@ -508,4 +508,4 @@ namespace HeavenStudio.Games
return shadow;
}
}
}
}