diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 3b2ddc97..a00616e7 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -11798,7 +11798,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: level: {fileID: 0} - music: {fileID: 0} + music: {fileID: 8300000, guid: c0b3e65059fb3cd49aa056342f2246c8, type: 3} debugUI: 0 playOnStart: 0 editor: 1 @@ -17111,7 +17111,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 45 m_Viewport: {fileID: 9172948791288181729} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 9172948790907700978} diff --git a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs index ef326e4f..ca9d4fc7 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs @@ -21,6 +21,8 @@ namespace RhythmHeavenMania.Editor private bool active; + private int childCountAtStart; + public static EventParameterManager instance { get; set; } private void Awake() @@ -28,6 +30,11 @@ namespace RhythmHeavenMania.Editor instance = this; } + private void Start() + { + childCountAtStart = transform.childCount; + } + private void Update() { if (Input.GetMouseButtonDown(0)) @@ -113,7 +120,7 @@ namespace RhythmHeavenMania.Editor private void DestroyParams() { active = false; - for (int i = 2; i < transform.childCount; i++) + for (int i = childCountAtStart; i < transform.childCount; i++) { Destroy(transform.GetChild(i).gameObject); } diff --git a/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs index c4c27d69..81c1e7af 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs @@ -48,6 +48,12 @@ namespace RhythmHeavenMania.Editor inputField.text = slider.value.ToString(); parameterManager.entity[propertyName] = (int)slider.value; }); + + inputField.onEndEdit.AddListener(delegate + { + slider.value = Mathf.RoundToInt(System.Convert.ToSingle(System.Convert.ToSingle(inputField.text))); + parameterManager.entity[propertyName] = (int)slider.value; + }); } else if (objType == typeof(EntityTypes.Float)) {