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

Merge pull request #7 from CarsonKompon/fix-editor-button-new

Browse source 
Added New (CTRL+N) Button
This commit is contained in:
Jenny Crowe 2022-02-25 22:37:21 -07:00 committed by GitHub
parent 37a2ed24c7 e2ee02775a
commit 03fd520517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Assets/Scenes/Editor.unity
View file

@ -16383,7 +16383,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1683100751}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 1423699437}
m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.Editor, Assembly-CSharp
m_MethodName: LoadRemix
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1683100751
MonoBehaviour:
m_ObjectHideFlags: 0

22
Assets/Scripts/GameManager.cs
View file

@ -73,9 +73,7 @@ namespace RhythmHeavenMania
}
else
{
Beatmap = new Beatmap();
Beatmap.bpm = 120f;
Beatmap.firstBeatOffset = 0f;
NewRemix();
}
SortEventsList();
@ -106,11 +104,25 @@ namespace RhythmHeavenMania
}
}
public void LoadRemix(string json)
public void NewRemix()
{
Beatmap = new Beatmap();
Beatmap.bpm = 120f;
Beatmap.firstBeatOffset = 0f;
}
public void LoadRemix(string json = "")
{
SortEventsList();
Beatmap = JsonConvert.DeserializeObject<Beatmap>(json);
if (json != "")
{
Beatmap = JsonConvert.DeserializeObject<Beatmap>(json);
}
else
{
NewRemix();
}
Conductor.instance.SetBpm(Beatmap.bpm);
Conductor.instance.firstBeatOffset = Beatmap.firstBeatOffset;
Stop(0);

13
Assets/Scripts/LevelEditor/Editor.cs
View file

@ -319,6 +319,14 @@ namespace RhythmHeavenMania.Editor
}
}
public void LoadRemix(string json = "")
{
GameManager.instance.LoadRemix(json);
Timeline.instance.LoadRemix();
Timeline.instance.TempoInfo.UpdateStartingBPMText();
Timeline.instance.TempoInfo.UpdateOffsetText();
}
public void OpenRemix()
{
var extensions = new[]
@ -348,10 +356,7 @@ namespace RhythmHeavenMania.Editor
stream.CopyTo(ms);
bytes = ms.ToArray();
string json = Encoding.Default.GetString(bytes);
GameManager.instance.LoadRemix(json);
Timeline.instance.LoadRemix();
Timeline.instance.TempoInfo.UpdateStartingBPMText();
Timeline.instance.TempoInfo.UpdateOffsetText();
LoadRemix(json);
}
}
}