Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 08:27:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Game switching fixes

Browse Source
This commit is contained in:
Braedon
2022-01-15 12:45:08 -05:00
parent 799592860a
commit 0d5b938c52
9 changed files with 202 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Assets/Scripts/Conductor.cs
View File

@ -35,9 +35,18 @@ namespace RhythmHeavenMania
// Conductor instance
public static Conductor instance;
// Conductor is currently playing song
public bool isPlaying;
// Conductor is currently paused, but not fully stopped
public bool isPaused;
// Last reported beat based on song position
private float lastReportedBeat = 0f;
// Metronome tick sound enabled
public bool metronome = false;
// private AudioDspTimeKeeper timeKeeper;
void Awake()
@ -101,13 +110,6 @@ namespace RhythmHeavenMania
musicSource.Stop();
}
/*public void SetTime(float startBeat)
{
musicSource.time = GetSongPosFromBeat(startBeat);
songPositionInBeats = musicSource.time / secPerBeat;
GameManager.instance.SetCurrentEventToClosest(songPositionInBeats);
}*/
public void Update()
{
if (isPlaying)
@ -117,6 +119,19 @@ namespace RhythmHeavenMania
songPosition = time - firstBeatOffset;
songPositionInBeats = songPosition / secPerBeat;
if (metronome)
{
if (songPosition > lastReportedBeat + secPerBeat)
{
RhythmHeavenMania.Util.Jukebox.PlayOneShot("metronome");
lastReportedBeat = (songPosition - (songPosition % secPerBeat));
}
else if (songPosition <= lastReportedBeat)
{
lastReportedBeat = (songPosition - (songPosition % secPerBeat));
}
}
}
}

42
Assets/Scripts/GameManager.cs
View File

@ -105,25 +105,18 @@ namespace RhythmHeavenMania
// GameManager entities should ALWAYS execute before gameplay entities
for (int i = 0; i < gameManagerEntities.Count; i++)
{
var gameManagerEntity = gameManagerEntities[i];
if ((gameManagerEntity.beat + eventCaller.GetGameAction(eventCaller.GetMinigame(gameManagerEntity.datamodel.Split(0)), gameManagerEntity.datamodel.Split(1)).defaultLength) > Conductor.instance.songPositionInBeats)
{
eventCaller.CallEvent(gameManagerEntities[i].datamodel);
}
eventCaller.CallEvent(gameManagerEntities[i].datamodel);
}
for (int i = 0; i < entitesAtSameBeat.Count; i++)
{
var entity = entitesAtSameBeat[i];
if ((entity.beat + eventCaller.GetGameAction(eventCaller.GetMinigame(entity.datamodel.Split(0)), entity.datamodel.Split(1)).defaultLength) > Conductor.instance.songPositionInBeats)
// if game isn't loaded, preload game so whatever event that would be called will still run outside if needed
if (entitesAtSameBeat[i].datamodel.Split('/')[0] != currentGame && !preloadedGames.Contains(preloadedGames.Find(c => c.name == entitesAtSameBeat[i].datamodel.Split('/')[0])))
{
// if game isn't loaded, preload game so whatever event that would be called will still run outside if needed
if (entitesAtSameBeat[i].datamodel.Split('/')[0] != currentGame && !preloadedGames.Contains(preloadedGames.Find(c => c.name == entitesAtSameBeat[i].datamodel.Split('/')[0])))
{
PreloadGame(entitesAtSameBeat[i].datamodel.Split('/')[0]);
}
eventCaller.CallEvent(entitesAtSameBeat[i].datamodel);
PreloadGame(entitesAtSameBeat[i].datamodel.Split('/')[0]);
}
eventCaller.CallEvent(entitesAtSameBeat[i].datamodel);
}
currentEvent += entitesAtSameBeat.Count + gameManagerEntities.Count;
@ -183,16 +176,17 @@ namespace RhythmHeavenMania
currentEvent = entities.IndexOf(Mathp.GetClosestInList(entities, beat));
string newGame = Beatmap.entities[currentEvent].datamodel.Split('/')[0];
var gameSwitchs = Beatmap.entities.FindAll(c => c.datamodel.Split(1) == "switchGame" && c.beat <= beat);
if (Beatmap.entities[currentEvent].datamodel.Split('/')[1] != "switchGame")
string newGame = Beatmap.entities[currentEvent].datamodel.Split(0);
if (gameSwitchs.Count > 0)
{
if (newGame == "gameManager")
{
// holy shit
newGame = Beatmap.entities[entities.IndexOf(Mathp.GetClosestInList(Beatmap.entities.FindAll(c => c.datamodel != "gameManager" && c.beat < Conductor.instance.songPositionInBeats).ToList().Select(c => c.beat).ToList(), beat))].datamodel.Split('/')[0];
}
newGame = gameSwitchs[gameSwitchs.IndexOf(gameSwitchs.Find(c => c.beat == Mathp.GetClosestInList(gameSwitchs.Select(c => c.beat).ToList(), beat)))].datamodel.Split(2);
}
if (Beatmap.entities[currentEvent].datamodel.Split(1) != "switchGame" && Beatmap.entities[currentEvent].datamodel.Split(0) != "gameManager")
{
SetGame(newGame);
}
}
@ -202,8 +196,12 @@ namespace RhythmHeavenMania
public void SwitchGame(string game)
{
if (currentGameSwitchIE != null) StopCoroutine(currentGameSwitchIE);
currentGameSwitchIE = StartCoroutine(SwitchGameIE(game));
if (game != currentGame)
{
if (currentGameSwitchIE != null)
StopCoroutine(currentGameSwitchIE);
currentGameSwitchIE = StartCoroutine(SwitchGameIE(game));
}
}
IEnumerator SwitchGameIE(string game)
@ -212,7 +210,7 @@ namespace RhythmHeavenMania
SetGame(game);
yield return new WaitForSeconds(0.1666f);
yield return new WaitForSeconds(0.1f);
this.GetComponent<SpriteRenderer>().enabled = false;
}

15
Assets/Scripts/LevelEditor/Timeline.cs
View File

@ -20,6 +20,7 @@ namespace RhythmHeavenMania.Editor
public List<TimelineEventObj> eventObjs = new List<TimelineEventObj>();
private bool lastFrameDrag;
public int LayerCount = 4;
public bool metronomeEnabled;
[Header("Timeline Components")]
[SerializeField] private RectTransform TimelineSlider;
@ -67,6 +68,19 @@ namespace RhythmHeavenMania.Editor
});
PauseBTN.onClick.AddListener(delegate { PlayCheck(false); });
StopBTN.onClick.AddListener(delegate { PlayCheck(true); });
MetronomeBTN.onClick.AddListener(delegate
{
if (!Conductor.instance.metronome)
{
MetronomeBTN.transform.GetChild(0).GetComponent<Image>().color = "009FC6".Hex2RGB();
Conductor.instance.metronome = true;
}
else
{
MetronomeBTN.transform.GetChild(0).GetComponent<Image>().color = Color.gray;
Conductor.instance.metronome = false;
}
});
Tooltip.instance.AddTooltip(PlayBTN.gameObject, "Play <color=#adadad>[Space]</color>");
Tooltip.instance.AddTooltip(PauseBTN.gameObject, "Pause <color=#adadad>[Shift + Space]</color>");
@ -74,6 +88,7 @@ namespace RhythmHeavenMania.Editor
Tooltip.instance.AddTooltip(MetronomeBTN.gameObject, "Metronome");
SetTimeButtonColors(true, false, false);
MetronomeBTN.transform.GetChild(0).GetComponent<Image>().color = Color.gray;
}
#endregion