mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-08 18:55:07 +00:00
Revert "Merge pull request #648 from blank3times/master"
This reverts commitbb4098665d
, reversing changes made toda73d62ce7
.
This commit is contained in:
parent
1509bd137a
commit
7b9a8036d0
2 changed files with 17 additions and 17 deletions
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue