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

disable timeline pitch change when song is paused

Browse source 
enable perfect challenge if no marker is set to do so
This commit is contained in:
minenice55 2023-12-20 23:22:43 -05:00
parent 4edf062ceb
commit f8f7aafd71
4 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/AppInfo.cs
View file

@ -1,8 +1,8 @@
using System; using System;
public static class AppInfo { public static class AppInfo {
public const string Version = "0.0.1017"; public const string Version = "0.0.1018";
public static readonly DateTime Date = new DateTime(2023, 11, 12, 04, 10, 42, 238, DateTimeKind.Utc); public static readonly DateTime Date = new DateTime(2023, 12, 21, 03, 53, 15, 934, DateTimeKind.Utc);
} }

2
Assets/Scripts/Conductor.cs
View file

@ -86,6 +86,7 @@ namespace HeavenStudio
private float timelinePitch = 1f; private float timelinePitch = 1f;
private float minigamePitch = 1f; private float minigamePitch = 1f;
public float SongPitch { get => isPaused ? 0f : (timelinePitch * minigamePitch); } public float SongPitch { get => isPaused ? 0f : (timelinePitch * minigamePitch); }
public float TimelinePitch { get => timelinePitch; }
private float musicScheduledPitch = 1f; private float musicScheduledPitch = 1f;
private double musicScheduledTime = 0; private double musicScheduledTime = 0;
@ -95,6 +96,7 @@ namespace HeavenStudio
public void SetTimelinePitch(float pitch) public void SetTimelinePitch(float pitch)
{ {
if (isPaused) return;
if (pitch != 0 && pitch * minigamePitch != SongPitch) if (pitch != 0 && pitch * minigamePitch != SongPitch)
{ {
Debug.Log("added pitch change " + pitch * minigamePitch + " at" + absTime); Debug.Log("added pitch change " + pitch * minigamePitch + " at" + absTime);

18
Assets/Scripts/GameManager.cs
View file

@ -718,6 +718,24 @@ namespace HeavenStudio
if (miniGame != null) if (miniGame != null)
miniGame.OnPlay(beat); miniGame.OnPlay(beat);
onPlay?.Invoke(beat); onPlay?.Invoke(beat);
bool hasStartPerfect = false;
foreach (RiqEntity marker in Beatmap.SectionMarkers)
{
if (marker["startPerfect"])
{
hasStartPerfect = true;
break;
}
}
if (OverlaysManager.OverlaysEnabled && !hasStartPerfect)
{
if (PersistentDataManager.gameSettings.perfectChallengeType != PersistentDataManager.PerfectChallengeType.Off)
{
GoForAPerfect.instance.Enable(0);
}
}
} }
else else
{ {

19
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -397,6 +397,8 @@ namespace HeavenStudio.Editor.Track
MouseInTimeline = RectTransformUtility.RectangleContainsScreenPoint(TimelineScroll.viewport, MouseInTimeline = RectTransformUtility.RectangleContainsScreenPoint(TimelineScroll.viewport,
Input.mousePosition, Editor.instance.EditorCamera); Input.mousePosition, Editor.instance.EditorCamera);
PlaybackSpeed.interactable = !Conductor.instance.isPaused;
foreach (var rect in GameObject.FindGameObjectsWithTag("BlocksEditor")) foreach (var rect in GameObject.FindGameObjectsWithTag("BlocksEditor"))
{ {
if (!rect.activeInHierarchy) continue; if (!rect.activeInHierarchy) continue;
@ -1112,16 +1114,31 @@ namespace HeavenStudio.Editor.Track
const float SpeedSnap = 0.25f; const float SpeedSnap = 0.25f;
public void SetPlaybackSpeed(float speed) public void SetPlaybackSpeed(float speed)
{
if (Conductor.instance.isPaused)
{
float spd = Conductor.instance.TimelinePitch;
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
PlaybackSpeed.value = spd;
}
else
{ {
float spd = Mathp.Round2Nearest(speed, SpeedSnap); float spd = Mathp.Round2Nearest(speed, SpeedSnap);
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x"; PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
Conductor.instance.SetTimelinePitch(spd); Conductor.instance.SetTimelinePitch(spd);
PlaybackSpeed.value = spd; PlaybackSpeed.value = spd;
} }
}
public void ResetPlaybackSpeed() public void ResetPlaybackSpeed()
{ {
if (Input.GetMouseButton(1)) if (Conductor.instance.isPaused)
{
float spd = Conductor.instance.TimelinePitch;
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
PlaybackSpeed.value = spd;
}
else if (Input.GetMouseButton(1))
{ {
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: 1x"; PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: 1x";
PlaybackSpeed.value = 1f; PlaybackSpeed.value = 1f;