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

Fixed some bugs, including one where the game refuses to load a new game. Also migrating a few games to the new Input system. (Read desc)

Browse Source 
However the new input system has a bug where if you press with two events eligible for a press, both of them interact. I don't know whether to fix this or not.
This commit is contained in:
Braedon
2022-01-23 02:01:59 -05:00
parent f53570bbae
commit 6ac919a232
16 changed files with 254 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Scripts/GameManager.cs
View File

@ -84,6 +84,7 @@ namespace RhythmHeavenMania
}
}
// LateUpdate works a bit better but causes a bit of bugs, so remind me to fix those eventually
private void Update()
{
if (Beatmap.entities.Count < 1)
@ -255,7 +256,7 @@ namespace RhythmHeavenMania
if (instantiate)
{
currentGameO = Instantiate(GetGame(game).holder);
currentGameO = Instantiate(GetGame(game));
currentGameO.transform.parent = eventCaller.GamesHolder.transform;
currentGameO.name = game;
}
@ -264,8 +265,8 @@ namespace RhythmHeavenMania
if (onGameSwitch)
{
if (GetGame(currentGame).holder.GetComponent<Minigame>() != null)
GetGame(game).holder.GetComponent<Minigame>().OnGameSwitch();
if (GetGame(currentGame).GetComponent<Minigame>() != null)
GetGame(game).GetComponent<Minigame>().OnGameSwitch();
}
SetCurrentGame(game);
@ -276,16 +277,21 @@ namespace RhythmHeavenMania
if (preloadedGames.Contains(preloadedGames.Find(c => c.name == game)))
return;
var g = Instantiate(GetGame(game).holder);
var g = Instantiate(GetGame(game));
g.transform.parent = eventCaller.GamesHolder.transform;
g.SetActive(false);
g.name = game;
preloadedGames.Add(g);
}
public Minigames.Minigame GetGame(string name)
public GameObject GetGame(string name)
{
return eventCaller.minigames.Find(c => c.name == name);
return Resources.Load<GameObject>($"Games/{name}");
}
public Minigames.Minigame GetGameInfo(string name)
{
return EventCaller.instance.minigames.Find(c => c.name == name);
}
// never gonna use this
@ -297,7 +303,7 @@ namespace RhythmHeavenMania
public void SetCurrentGame(string game)
{
currentGame = game;
CircleCursor.InnerCircle.GetComponent<SpriteRenderer>().color = Colors.Hex2RGB(GetGame(currentGame).color);
CircleCursor.InnerCircle.GetComponent<SpriteRenderer>().color = Colors.Hex2RGB(GetGameInfo(currentGame).color);
}
private bool SongPosLessThanClipLength(float t)