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

Keyboard shortcuts for timeline state

Browse Source
This commit is contained in:
Braedon
2022-01-29 16:59:20 -05:00
parent af24468f25
commit e4cc930b7e
7 changed files with 927 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scripts/Games/SpaceSoccer/Kicker.cs
View File

@ -171,7 +171,6 @@ namespace RhythmHeavenMania.Games.SpaceSoccer
{
if ((highKicks[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && highKicks[i].beat + 1f > Conductor.instance.songPositionInBeats)
{
print("bruh");
canHighKick = true;
canKick = false;
break;

4
Assets/Scripts/GlobalGameManager.cs
View File

@ -37,11 +37,11 @@ namespace RhythmHeavenMania
loadedScene = 0;
fadeDuration = 0;
GameObject ui = new GameObject();
/*GameObject ui = new GameObject();
ui.AddComponent<SpriteRenderer>().sprite = Resources.Load<Sprite>("tempBuildUI");
ui.GetComponent<SpriteRenderer>().sortingOrder = 1000;
ui.layer = 5;
ui.name = "tempBuildUI";
ui.name = "tempBuildUI";*/
}
public void Awake()

4
Assets/Scripts/LevelEditor/Editor.cs
View File

@ -34,6 +34,8 @@ namespace RhythmHeavenMania.Editor
[SerializeField] private Button SaveBTN;
[SerializeField] private Button UndoBTN;
[SerializeField] private Button RedoBTN;
[SerializeField] private Button MusicSelectBTN;
[SerializeField] private Button EditorSettingsBTN;
public static List<TimelineEventObj> EventObjs = new List<TimelineEventObj>();
@ -67,6 +69,8 @@ namespace RhythmHeavenMania.Editor
Tooltip.AddTooltip(SaveBTN.gameObject, "Save Project <color=#adadad>[Ctrl+S]</color>\nSave Project As <color=#adadad>[Ctrl+Alt+S]</color>");
Tooltip.AddTooltip(UndoBTN.gameObject, "Undo <color=#adadad>[Ctrl+Z]</color>");
Tooltip.AddTooltip(RedoBTN.gameObject, "Redo <color=#adadad>[Ctrl+Y or Ctrl+Shift+Z]</color>");
Tooltip.AddTooltip(MusicSelectBTN.gameObject, "Music Select");
Tooltip.AddTooltip(EditorSettingsBTN.gameObject, "Editor Settings <color=#adadad>[Ctrl+O]</color>");
}
public void Update()

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

@ -250,6 +250,19 @@ namespace RhythmHeavenMania.Editor.Track
TimelineContent.transform.localPosition = new Vector3(Mathf.Clamp(TimelineContent.transform.localPosition.x, Mathf.NegativeInfinity, 0), TimelineContent.transform.localPosition.y);
CurrentTempo.text = $" = {Conductor.instance.songBpm}";
if (Input.GetKeyDown(KeyCode.Alpha1))
{
timelineState.SetState(true, false, false);
}
else if (Input.GetKeyDown(KeyCode.Alpha2))
{
timelineState.SetState(false, true, false);
}
else if (Input.GetKeyDown(KeyCode.Alpha3))
{
timelineState.SetState(false, false, true);
}
}
private void SliderControl()