From 4ebcdd038dfe5875161d4e4917dda23a53704fbe Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 25 Feb 2022 22:48:44 -0500 Subject: [PATCH] Preventing even more code re-use Editor.NewRemix() from my last commit is now Editor.LoadRemix(json) and is called within Editor.LoadRemix(). The "New" button new calls Editor.LoadRemix(""); --- Assets/Scenes/Editor.unity | 4 ++-- Assets/Scripts/LevelEditor/Editor.cs | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 92c808b6..d10dd0e0 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -16386,8 +16386,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1423699437} m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.Editor, Assembly-CSharp - m_MethodName: NewRemix - m_Mode: 1 + m_MethodName: LoadRemix + m_Mode: 5 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 26682de1..11be7854 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -319,9 +319,9 @@ namespace RhythmHeavenMania.Editor } } - public void NewRemix() + public void LoadRemix(string json = "") { - GameManager.instance.LoadRemix(""); + GameManager.instance.LoadRemix(json); Timeline.instance.LoadRemix(); Timeline.instance.TempoInfo.UpdateStartingBPMText(); Timeline.instance.TempoInfo.UpdateOffsetText(); @@ -356,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); } } }