mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-10 03:35:10 +00:00
Merge pull request #5 from Slaith12/master
Fixed tempo change tool not working
This commit is contained in:
commit
f5b754c440
3 changed files with 68 additions and 1 deletions
|
@ -49,7 +49,7 @@ namespace RhythmHeavenMania
|
|||
Init();
|
||||
DontDestroyOnLoad(this.gameObject);
|
||||
instance = this;
|
||||
Starpelly.OS.Windows.ChangeWindowTitle($"Rhythm Heaven Mania DEMO");
|
||||
Starpelly.OS.Windows.ChangeWindowTitle($"Heaven Studio DEMO");
|
||||
}
|
||||
|
||||
public static GameObject CreateFade()
|
||||
|
|
|
@ -56,6 +56,7 @@ namespace RhythmHeavenMania.Editor.Track
|
|||
else if (Input.GetMouseButtonDown(1))
|
||||
{
|
||||
GameManager.instance.Beatmap.tempoChanges.Remove(tempoChange);
|
||||
transform.parent.GetComponent<TempoTimeline>().tempoTimelineObjs.Remove(this);
|
||||
Destroy(this.gameObject);
|
||||
}
|
||||
|
||||
|
|
|
@ -106,6 +106,72 @@ namespace RhythmHeavenMania
|
|||
}),
|
||||
new Minigame("countIn", "Count-Ins", "", false, true, new List<GameAction>()
|
||||
{
|
||||
new GameAction("4 beat count-in", delegate
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[]
|
||||
{
|
||||
new MultiSound.Sound("count-ins/one1", eventCaller.currentEntity.beat),
|
||||
new MultiSound.Sound("count-ins/two1", eventCaller.currentEntity.beat + 1f),
|
||||
new MultiSound.Sound("count-ins/three1", eventCaller.currentEntity.beat + 2f),
|
||||
new MultiSound.Sound("count-ins/four1", eventCaller.currentEntity.beat + 3f)
|
||||
}, false);
|
||||
}, 4f),
|
||||
new GameAction("4 beat count-in (alt)", delegate
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[]
|
||||
{
|
||||
new MultiSound.Sound("count-ins/one2", eventCaller.currentEntity.beat),
|
||||
new MultiSound.Sound("count-ins/two2", eventCaller.currentEntity.beat + 1f),
|
||||
new MultiSound.Sound("count-ins/three2", eventCaller.currentEntity.beat + 2f),
|
||||
new MultiSound.Sound("count-ins/four2", eventCaller.currentEntity.beat + 3f)
|
||||
}, false);
|
||||
}, 4f),
|
||||
new GameAction("4 beat count-in (cowbell)", delegate
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[]
|
||||
{
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 1f),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 2f),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 3f)
|
||||
}, false);
|
||||
}, 4f),
|
||||
new GameAction("8 beat count-in", delegate
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[]
|
||||
{
|
||||
new MultiSound.Sound("count-ins/one1", eventCaller.currentEntity.beat),
|
||||
new MultiSound.Sound("count-ins/two1", eventCaller.currentEntity.beat + 2f),
|
||||
new MultiSound.Sound("count-ins/one1", eventCaller.currentEntity.beat + 4f),
|
||||
new MultiSound.Sound("count-ins/two1", eventCaller.currentEntity.beat + 5f),
|
||||
new MultiSound.Sound("count-ins/three1", eventCaller.currentEntity.beat + 6f),
|
||||
new MultiSound.Sound("count-ins/four1", eventCaller.currentEntity.beat + 7f)
|
||||
}, false);
|
||||
}, 8f),
|
||||
new GameAction("8 beat count-in (alt)", delegate
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[]
|
||||
{
|
||||
new MultiSound.Sound("count-ins/one2", eventCaller.currentEntity.beat),
|
||||
new MultiSound.Sound("count-ins/two2", eventCaller.currentEntity.beat + 2f),
|
||||
new MultiSound.Sound("count-ins/one2", eventCaller.currentEntity.beat + 4f),
|
||||
new MultiSound.Sound("count-ins/two2", eventCaller.currentEntity.beat + 5f),
|
||||
new MultiSound.Sound("count-ins/three2", eventCaller.currentEntity.beat + 6f),
|
||||
new MultiSound.Sound("count-ins/four2", eventCaller.currentEntity.beat + 7f)
|
||||
}, false);
|
||||
}, 8f),
|
||||
new GameAction("8 beat count-in (cowbell)", delegate
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[]
|
||||
{
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 2f),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 4f),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 5f),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 6f),
|
||||
new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 7f)
|
||||
}, false);
|
||||
}, 8f),
|
||||
new GameAction("cowbell", delegate { Jukebox.PlayOneShot("count-ins/cowbell"); }, 1f),
|
||||
new GameAction("one", delegate { Jukebox.PlayOneShot("count-ins/one1"); }, 1f),
|
||||
new GameAction("one (alt)", delegate { Jukebox.PlayOneShot("count-ins/one2"); }, 1f),
|
||||
|
|
Loading…
Reference in a new issue