From 22c6ca80cafc9cb3efac4d9c597c870a7df10fd8 Mon Sep 17 00:00:00 2001
From: SoulliesOfficial <77235731+SoulliesOfficial@users.noreply.github.com>
Date: Thu, 20 Mar 2025 02:42:10 -0400
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0TubeGenerator=EF=BC=8CDUI?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Simple/DynamicUIBaseColorPicker.cs        |   2 +-
 .../Simple/DynamicUIButton.cs                 |   9 +-
 .../Simple/DynamicUIElement.cs                |   7 +
 .../Simple/DynamicUIEmissionColorPicker.cs    |   2 +-
 .../Simple/DynamicUIEnumDropdown.cs           |   4 +-
 .../Simple/DynamicUIHintText.cs               |   6 +
 .../Simple/DynamicUIInputField.cs             |   4 +-
 .../Simple/DynamicUIParameterText.cs          |   6 +
 .../Simple/DynamicUIStringListDropdown.cs     |   4 +-
 .../Simple/DynamicUIToggle.cs                 |   4 +-
 .../Simple/DynamicUIVector3InputField.cs      |   2 +-
 .../DynamicUI/Inspector/IHaveInspection.cs    |   1 +
 .../Scripts/DynamicUI/Inspector/Inspector.cs  |   3 +
 .../Inspector/InspectorSecondaryWindow.cs     |   5 +-
 .../TimeDurationSubmodule.cs                  |   4 +-
 .../EnvironmentObjects/BackgroundSetter.cs    |   8 +-
 .../EnvironmentObjects/EnvironmentObject.cs   |   9 +-
 .../EditorGame/GameElements/GameElement.cs    |   3 +-
 .../FullScreenNearTimeJudgeUnit.cs            |   3 +-
 .../JudgeSubmodules/TouchAreaJudgeUnit.cs     |   2 +-
 .../GameElements/Notes/NoteObjects/Hold.cs    |   9 +-
 .../Notes/NoteObjects/NoteBase.cs             |   4 +-
 .../GameElements/TemporaryObject.cs           |   4 +-
 .../EditorGame/GameElements/Track/PathNode.cs |   2 +-
 .../EditorGame/GameElements/Track/Track.cs    |  10 ++
 .../TrackSubmodules/TrackPathSubmodule.cs     |   8 +-
 .../TrackSubmodules/TrackRendererSubmodule.cs | 154 ++++++++++++++++--
 .../TrackSubmodules/TrackTimeSubmodule.cs     |   6 +-
 .../EditorGame/GameElements/Track/Trail.cs    |   6 +-
 Assets/Scripts/Manager/SceneCamera.cs         |   6 +-
 .../Projects/Terminal/Beatmap.json            | 131 +++++++++++++++
 .../EnvironmentObjects/DirectionalLight.cs    |   4 +-
 .../Scripts/EnvironmentObjects/PointLight.cs  |   6 +-
 33 files changed, 381 insertions(+), 57 deletions(-)

diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIBaseColorPicker.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIBaseColorPicker.cs
index 930fc556..b8eb8bac 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIBaseColorPicker.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIBaseColorPicker.cs
@@ -60,7 +60,7 @@ namespace Ichni.Editor
             ApplyParameters();
         }
 
-        public void AddListenerFunction(UnityAction action)
+        public override void AddListenerFunction(UnityAction action)
         {
             inputFieldBaseR.onEndEdit.AddListener(_ => action());
             inputFieldBaseG.onEndEdit.AddListener(_ => action());
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIButton.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIButton.cs
index 2725a51f..1f16f13e 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIButton.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIButton.cs
@@ -13,10 +13,10 @@ namespace Ichni.Editor
         public Button button;
         public TMP_Text buttonText;
 
-        public void SetText(string buttonText, bool hasTitle)
+        public void SetText(string buttonText, bool showTitle)
         {
             this.buttonText.text = buttonText;
-            if(!hasTitle) title.gameObject.SetActive(false);
+            if(!showTitle) title.gameObject.SetActive(false);
         }
 
         public void ApplyFunction(UnityAction function)
@@ -27,5 +27,10 @@ namespace Ichni.Editor
                 button.onClick.AddListener(connectedBaseElement.Refresh);
             }
         }
+        
+        public override void AddListenerFunction(UnityAction action)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIElement.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIElement.cs
index 6c746c98..d152b143 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIElement.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIElement.cs
@@ -34,6 +34,13 @@ namespace Ichni.Editor
             }
         }
 
+        public void Mark(IHaveInspection inspection, string mark)
+        {
+            inspection.MarkedElements.Add(mark, this);
+        }
+
+        public abstract void AddListenerFunction(UnityAction action);
+
         public virtual void DeviverSet(int DeviveNum){
             float o=2f/DeviveNum;//因为所有的单UI都是根据2栏来的
             Button[] childb=GetComponentsInChildren<Button>();
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEmissionColorPicker.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEmissionColorPicker.cs
index 5b50b6c3..0ec46293 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEmissionColorPicker.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEmissionColorPicker.cs
@@ -75,7 +75,7 @@ namespace Ichni.Editor
             ApplyParameters();
         }
         
-        public void AddListenerFunction(UnityAction action)
+        public override void AddListenerFunction(UnityAction action)
         {
             inputFieldEmissionR.onEndEdit.AddListener(_ => action());
             inputFieldEmissionG.onEndEdit.AddListener(_ => action());
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEnumDropdown.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEnumDropdown.cs
index 61dbe3fe..df5a17d1 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEnumDropdown.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEnumDropdown.cs
@@ -33,9 +33,9 @@ namespace Ichni.Editor
             connectedBaseElement.Refresh();
         }
         
-        public void AddListenerFunction(UnityAction<int> action)
+        public override void AddListenerFunction(UnityAction action)
         {
-            dropdown.onValueChanged.AddListener(action);
+            dropdown.onValueChanged.AddListener(_ => action());
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIHintText.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIHintText.cs
index 81ebd045..f921f00c 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIHintText.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIHintText.cs
@@ -5,6 +5,7 @@ using Ichni.RhythmGame;
 using TMPro;
 using UniRx;
 using UnityEngine;
+using UnityEngine.Events;
 
 namespace Ichni.Editor
 {
@@ -21,5 +22,10 @@ namespace Ichni.Editor
         {
             Observable.EveryUpdate().Subscribe(_ => text.text = content()).AddTo(gameObject);
         }
+
+        public override void AddListenerFunction(UnityAction action)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIInputField.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIInputField.cs
index 5b236175..3f85266d 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIInputField.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIInputField.cs
@@ -71,9 +71,9 @@ namespace Ichni.Editor
             connectedBaseElement.Refresh();
         }
         
-        public void AddListenerFunction(UnityAction<string> action)
+        public override void AddListenerFunction(UnityAction action)
         {
-            inputField.onEndEdit.AddListener(action);
+            inputField.onEndEdit.AddListener(_ => action());
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIParameterText.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIParameterText.cs
index cf1b4702..4c95b055 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIParameterText.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIParameterText.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using Ichni.RhythmGame;
 using TMPro;
 using UnityEngine;
+using UnityEngine.Events;
 
 namespace Ichni.Editor
 {
@@ -34,5 +35,10 @@ namespace Ichni.Editor
         {
             text.text = connectedBaseElement.GetType().GetField(parameterName).GetValue(connectedBaseElement).ToString();
         }
+
+        public override void AddListenerFunction(UnityAction action)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIStringListDropdown.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIStringListDropdown.cs
index 153d6ea7..f7555c20 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIStringListDropdown.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIStringListDropdown.cs
@@ -35,9 +35,9 @@ namespace Ichni.Editor
             connectedBaseElement.Refresh();
         }
         
-        public void AddListenerFunction(UnityAction<int> action)
+        public override void AddListenerFunction(UnityAction action)
         {
-            dropdown.onValueChanged.AddListener(action);
+            dropdown.onValueChanged.AddListener(_ => action());
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIToggle.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIToggle.cs
index a63ce15a..9a3aa6c4 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIToggle.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIToggle.cs
@@ -31,9 +31,9 @@ namespace Ichni.Editor
             connectedBaseElement.Refresh();
         }
 
-        public void AddListenerFunction(UnityAction<bool> action)
+        public override void AddListenerFunction(UnityAction action)
         {
-            toggle.onValueChanged.AddListener(action);
+            toggle.onValueChanged.AddListener(_ => action());
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIVector3InputField.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIVector3InputField.cs
index cc5a00f7..f531ef24 100644
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIVector3InputField.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIVector3InputField.cs
@@ -78,7 +78,7 @@ namespace Ichni.Editor
             connectedBaseElement.Refresh();
         }
         
-        public void AddListenerFunction(UnityAction action)
+        public override void AddListenerFunction(UnityAction action)
         {
             inputFieldX.onEndEdit.AddListener(_ => action());
             inputFieldY.onEndEdit.AddListener(_ => action());
diff --git a/Assets/Scripts/DynamicUI/Inspector/IHaveInspection.cs b/Assets/Scripts/DynamicUI/Inspector/IHaveInspection.cs
index 24d0008c..58cde76c 100644
--- a/Assets/Scripts/DynamicUI/Inspector/IHaveInspection.cs
+++ b/Assets/Scripts/DynamicUI/Inspector/IHaveInspection.cs
@@ -12,6 +12,7 @@ namespace Ichni.Editor
     {
         public RectTransform WindowRect { get; set; }
         public List<DynamicUIContainer> Containers { get; set; }
+        public Dictionary<string, DynamicUIElement> MarkedElements { get; set; }
 
         public CompositeParameterWindow GenerateCompositeParameterWindow(IBaseElement baseElement, string title,
             string parameterName)
diff --git a/Assets/Scripts/DynamicUI/Inspector/Inspector.cs b/Assets/Scripts/DynamicUI/Inspector/Inspector.cs
index b9ed443b..96cbfa66 100644
--- a/Assets/Scripts/DynamicUI/Inspector/Inspector.cs
+++ b/Assets/Scripts/DynamicUI/Inspector/Inspector.cs
@@ -17,11 +17,13 @@ namespace Ichni.Editor
 
         public RectTransform WindowRect { get; set; }
         public List<DynamicUIContainer> Containers { get; set; }
+        public Dictionary<string, DynamicUIElement> MarkedElements { get; set; }
 
         private void Awake()
         {
             WindowRect = inspectorRect;
             Containers = new List<DynamicUIContainer>();
+            MarkedElements = new Dictionary<string, DynamicUIElement>();
         }
 
         /// <summary>
@@ -39,6 +41,7 @@ namespace Ichni.Editor
         {
             Containers.ForEach(container => Destroy(container.gameObject));
             Containers.Clear();
+            MarkedElements.Clear();
         }
 
         public InspectorSecondaryWindow GenerateSecondaryWindow(GameElement gameElement, string title)
diff --git a/Assets/Scripts/DynamicUI/Inspector/InspectorSecondaryWindow.cs b/Assets/Scripts/DynamicUI/Inspector/InspectorSecondaryWindow.cs
index 6bf7fd97..f96c8c74 100644
--- a/Assets/Scripts/DynamicUI/Inspector/InspectorSecondaryWindow.cs
+++ b/Assets/Scripts/DynamicUI/Inspector/InspectorSecondaryWindow.cs
@@ -10,16 +10,17 @@ namespace Ichni.Editor
         public GameElement connectedGameElement;
         public RectTransform WindowRect { get; set; }
         public List<DynamicUIContainer> Containers { get; set; }
+        public Dictionary<string, DynamicUIElement> MarkedElements { get; set; }
 
         public void Initialize(GameElement gameElement, string titleText)
         {
             StartCoroutine(WindowAnim.ShowPanelOnScale(gameObject));
             WindowRect = windowRect;
             Containers = new List<DynamicUIContainer>();
-
+            MarkedElements = new Dictionary<string, DynamicUIElement>();
+            
             connectedGameElement = gameElement;
             InitializeWindow(titleText);
-
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/EditorGame/Base/GeneralSubmodules/TimeDurationSubmodule.cs b/Assets/Scripts/EditorGame/Base/GeneralSubmodules/TimeDurationSubmodule.cs
index 1c149309..cd6455b3 100644
--- a/Assets/Scripts/EditorGame/Base/GeneralSubmodules/TimeDurationSubmodule.cs
+++ b/Assets/Scripts/EditorGame/Base/GeneralSubmodules/TimeDurationSubmodule.cs
@@ -91,9 +91,11 @@ namespace Ichni.RhythmGame
     {
         public override void SetUpInspector()
         {
+            
             IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
             var container = inspector.GenerateContainer("Time Duration");
             var overrideToggle = inspector.GenerateToggle(this, container, "Override Duration", nameof(isOverridingDuration));
+            
             var startTimeInputField = inspector.GenerateInputField(this, container, "Start Time", nameof(startTime));
             var endTimeInputField = inspector.GenerateInputField(this, container, "End Time", nameof(endTime));
 
@@ -104,7 +106,7 @@ namespace Ichni.RhythmGame
             }
 
             SetInputFieldInteractable(isOverridingDuration);
-            overrideToggle.AddListenerFunction(SetInputFieldInteractable);
+            overrideToggle.AddListenerFunction(() => SetInputFieldInteractable(isOverridingDuration));
         }
 
 
diff --git a/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/BackgroundSetter.cs b/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/BackgroundSetter.cs
index dadcfe81..4e376d27 100644
--- a/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/BackgroundSetter.cs
+++ b/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/BackgroundSetter.cs
@@ -61,17 +61,17 @@ namespace Ichni.Editor
             var backgroundSpriteField = inspector.GenerateInputField(this, container, "Background Sprite", nameof(backgroundSpriteName));
             var applyButton = inspector.GenerateButton(this, container, "Apply", Refresh);
 
-            void SetFields(bool value)
+            void SetInputFields(bool value) // 根据是否使用Skybox设置输入框的可交互性
             {
                 skyboxThemeBundleField.inputField.interactable = value;
                 skyboxMaterialNameField.inputField.interactable = value;
                 backgroundSpriteField.inputField.interactable = !value;
             }
 
-            SetFields(useSkybox);
+            SetInputFields(useSkybox);
 
-            useSkyboxToggle.AddListenerFunction(value => EditorManager.instance.backgroundController.EnableBackground(!value));
-            useSkyboxToggle.AddListenerFunction(SetFields);
+            useSkyboxToggle.AddListenerFunction(() => EditorManager.instance.backgroundController.EnableBackground(!useSkybox));
+            useSkyboxToggle.AddListenerFunction(() => SetInputFields(useSkybox));
         }
 
         public override void Refresh()
diff --git a/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/EnvironmentObject.cs b/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/EnvironmentObject.cs
index 9cd69d9f..3da0fbf7 100644
--- a/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/EnvironmentObject.cs
+++ b/Assets/Scripts/EditorGame/GameElements/EnvironmentObjects/EnvironmentObject.cs
@@ -37,27 +37,34 @@ namespace Ichni.RhythmGame
         public override void SetUpInspector()
         {
             base.SetUpInspector();
+            
             IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
             var container = inspector.GenerateContainer("Generate");
+            
             var environmentObjectButton = inspector.GenerateButton(this, container, "Environment Object",
                 () => TemporaryObject.GenerateElement("New Environment Object", Guid.NewGuid(), new List<string>(),
                     true, this));
+            
             var isStaticToggle = inspector.GenerateToggle(this, container, "Is Static", nameof(isStatic));
-            isStaticToggle.AddListenerFunction(_ => gameObject.isStatic = isStatic);
+            isStaticToggle.AddListenerFunction(() => gameObject.isStatic = isStatic);
 
             var generateContainer = inspector.GenerateContainer("Generate");
             var generateDisplacementButton = inspector.GenerateButton(this, generateContainer, "Displacement",
                 () => Displacement.GenerateElement("New Displacement", Guid.NewGuid(), new List<string>(), true,
                     this, new FlexibleFloat(), new FlexibleFloat(), new FlexibleFloat()));
+            
             var generateSwirlButton = inspector.GenerateButton(this, generateContainer, "Swirl",
                 () => Swirl.GenerateElement("New Swirl", Guid.NewGuid(), new List<string>(), true,
                     this, new FlexibleFloat(), new FlexibleFloat(), new FlexibleFloat()));
+            
             var generateScaleButton = inspector.GenerateButton(this, generateContainer, "Scale",
                 () => Scale.GenerateElement("New Scale", Guid.NewGuid(), new List<string>(), true,
                     this, new FlexibleFloat(), new FlexibleFloat(), new FlexibleFloat()));
+            
             var generateBaseColorChangeButton = inspector.GenerateButton(this, generateContainer, "Base Color Change",
                 () => BaseColorChange.GenerateElement("New Base Color Change", Guid.NewGuid(), new List<string>(), true,
                     this, new FlexibleFloat(), new FlexibleFloat(), new FlexibleFloat(), new FlexibleFloat()));
+            
             if (haveEmission)
             {
                 var generateEmissionColorChangeButton = inspector.GenerateButton(this, generateContainer, "Emission Color Change",
diff --git a/Assets/Scripts/EditorGame/GameElements/GameElement.cs b/Assets/Scripts/EditorGame/GameElements/GameElement.cs
index aef114b9..2346aaed 100644
--- a/Assets/Scripts/EditorGame/GameElements/GameElement.cs
+++ b/Assets/Scripts/EditorGame/GameElements/GameElement.cs
@@ -161,7 +161,8 @@ namespace Ichni.RhythmGame
                 submodule.SetUpInspector();
             }
         }
-
+        
+        
         /// <summary>
         /// 获取所有子GameElement
         /// </summary>
diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/FullScreenNearTimeJudgeUnit.cs b/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/FullScreenNearTimeJudgeUnit.cs
index e1161354..e832be14 100644
--- a/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/FullScreenNearTimeJudgeUnit.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/FullScreenNearTimeJudgeUnit.cs
@@ -34,7 +34,8 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Full Screen Near Time Judge Unit");
             
             var isShowingJudgeField = inspector.GenerateToggle(this, container, "Is Showing Judge", nameof(isShowingJudge));
-            isShowingJudgeField.AddListenerFunction((isOn) => SetShowingJudge(isShowingJudge));
+            
+            isShowingJudgeField.AddListenerFunction(() => SetShowingJudge(isShowingJudge));
             
             var removeButton = inspector.GenerateButton(this, container, "Remove", () =>
             {
diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs b/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs
index 2eb4cb60..a50b7aae 100644
--- a/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs
@@ -39,7 +39,7 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Touch Area Judge Unit");
 
             var isShowingJudgeField = inspector.GenerateToggle(this, container, "Is Showing Judge", nameof(isShowingJudge));
-            isShowingJudgeField.AddListenerFunction((isOn) => SetShowingJudge(isShowingJudge));
+            isShowingJudgeField.AddListenerFunction(() => SetShowingJudge(isShowingJudge));
             
             var effectTimeField = inspector.GenerateInputField(this, container, "Area Radius", nameof(areaRadius));
             
diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs
index 84c3e3b9..18bfb3fa 100644
--- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs
@@ -93,7 +93,14 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Hold");
             
             var holdEndTimeInputField = inspector.GenerateInputField(this, container, "holdEndTime", nameof(holdEndTime));
-            holdEndTimeInputField.AddListenerFunction(_ =>
+            holdEndTimeInputField.AddListenerFunction(() =>
+            {
+                noteVisual?.effectSubmodule.effectCollection["Holding"].ForEach(effect =>
+                {
+                    effect.effectTime = holdEndTime - exactJudgeTime;
+                });
+            });
+            inspector.MarkedElements["ExactJudgeTime"].AddListenerFunction(() =>
             {
                 noteVisual?.effectSubmodule.effectCollection["Holding"].ForEach(effect =>
                 {
diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs
index e9b21231..7be1b7c2 100644
--- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs
@@ -150,9 +150,11 @@ namespace Ichni.RhythmGame
             
             IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
             var container = inspector.GenerateContainer("Note Info");
+            
             var exactJudgeTimeInputField =
                 inspector.GenerateInputField(this, container, "exactJudgeTime", nameof(exactJudgeTime));
-            exactJudgeTimeInputField.AddListenerFunction(_ => UpdateNoteInTrack());
+            exactJudgeTimeInputField.AddListenerFunction(UpdateNoteInTrack);
+            exactJudgeTimeInputField.Mark(inspector, "ExactJudgeTime");
             
             var noteScreenPositionText = inspector.GenerateHintText(this, container, () => "Note Screen Position: " + noteScreenPosition);
         }
diff --git a/Assets/Scripts/EditorGame/GameElements/TemporaryObject.cs b/Assets/Scripts/EditorGame/GameElements/TemporaryObject.cs
index daaae655..9e9d614d 100644
--- a/Assets/Scripts/EditorGame/GameElements/TemporaryObject.cs
+++ b/Assets/Scripts/EditorGame/GameElements/TemporaryObject.cs
@@ -33,14 +33,14 @@ namespace Ichni.RhythmGame
 
             var themeBundleDropdown = inspector.GenerateDropdown(this, container, "Theme Bundle", 
                 themeBundleList, nameof(themeBundleName));
-            themeBundleDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(this));
+            themeBundleDropdown.AddListenerFunction(() => inspectorMain.SetInspector(this));
 
             if (themeBundleName != String.Empty && ThemeBundleManager.instance.TryGetThemeBundle(themeBundleName, out ThemeBundle themeBundle))
             {
                 objectNameList = themeBundle.assetList_GameObject.ConvertAll(x => x.name);
                 var objectNameDropdown =
                     inspector.GenerateDropdown(this, container, "Object Name", objectNameList, nameof(objectName));
-                objectNameDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(this));
+                objectNameDropdown.AddListenerFunction(() => inspectorMain.SetInspector(this));
             }
             else
             {
diff --git a/Assets/Scripts/EditorGame/GameElements/Track/PathNode.cs b/Assets/Scripts/EditorGame/GameElements/Track/PathNode.cs
index de924daf..bd8439b9 100644
--- a/Assets/Scripts/EditorGame/GameElements/Track/PathNode.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Track/PathNode.cs
@@ -98,7 +98,7 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Path Node");
             var indexText = inspector.GenerateHintText(this, container, "Index: " + index);
             var isShowingSphereToggle = inspector.GenerateToggle(this, container, "Is Showing Sphere", nameof(isShowingSphere));
-            isShowingSphereToggle.AddListenerFunction(SetPathNodeSphere);
+            isShowingSphereToggle.AddListenerFunction(() => SetPathNodeSphere(isShowingSphere));
         }
     }
 
diff --git a/Assets/Scripts/EditorGame/GameElements/Track/Track.cs b/Assets/Scripts/EditorGame/GameElements/Track/Track.cs
index a9f2c084..b308f8d9 100644
--- a/Assets/Scripts/EditorGame/GameElements/Track/Track.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Track/Track.cs
@@ -118,6 +118,14 @@ namespace Ichni.RhythmGame
                     trackRendererSubmodule = new TrackRendererSubmodulePathGenerator(this, false, 0);
                     inspectorMain.SetInspector(this);
                 });
+            
+            var trackRenderTubeGeneratorButton = inspector.GenerateButton(this, trackSubmodulesContainer,
+                "Track Renderer Tube Generator",
+                () =>
+                {
+                    trackRendererSubmodule = new TrackRendererSubmoduleTubeGenerator(this, false, 0, 4);
+                    inspectorMain.SetInspector(this);
+                });
 
             var trackRendererSurfaceButton = inspector.GenerateButton(this, trackSubmodulesContainer, "Track Renderer Surface",
                 () =>
@@ -207,6 +215,8 @@ namespace Ichni.RhythmGame
             {
                 trackRendererAutoOrientButton.button.interactable = false;
                 trackRendererPathGeneratorButton.button.interactable = false;
+                trackRenderTubeGeneratorButton.button.interactable = false;
+                trackRendererSurfaceButton.button.interactable = false;
             }
             
             var toolsContainerTrack = inspector.GenerateContainer("Track Tools"); //轨道（整体）快捷工具
diff --git a/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackPathSubmodule.cs b/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackPathSubmodule.cs
index 6b7759e1..12650ea9 100644
--- a/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackPathSubmodule.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackPathSubmodule.cs
@@ -97,20 +97,24 @@ namespace Ichni.RhythmGame
         {
             IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
             var container = inspector.GenerateContainer("Track Path");
+            
             var trackSpaceDropdown =
                 inspector.GenerateDropdown(this, container, "Space Type", typeof(Track.TrackSpaceType), nameof(trackSpaceType));
+            
             var trackSamplingDropdown =
                 inspector.GenerateDropdown(this, container, "Sampling Type", typeof(Track.TrackSamplingType), nameof(trackSamplingType));
+            
             var isClosedToggle = 
                 inspector.GenerateToggle(this, container, "Is Closed", nameof(isClosed));
-            isClosedToggle.AddListenerFunction(_ => ClosePath());
+            isClosedToggle.AddListenerFunction(ClosePath);
+            
             var generatePathNodeButton = inspector.GenerateButton(this, container, "Generate Path Node", () =>
             {
                 PathNode.GenerateElement("New Path Node", Guid.NewGuid(), new List<string>(), true, track, true);
             });
             
             var showDisplayToggle = inspector.GenerateToggle(this, container, "Show Display", nameof(isShowingDisplay));
-            showDisplayToggle.AddListenerFunction(_ => SetDisplay(isShowingDisplay));
+            showDisplayToggle.AddListenerFunction(() => SetDisplay(isShowingDisplay));
         }
     }
 
diff --git a/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackRendererSubmodule.cs b/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackRendererSubmodule.cs
index 6d0b6e51..3d1f9e5e 100644
--- a/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackRendererSubmodule.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackRendererSubmodule.cs
@@ -111,19 +111,19 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Track Renderer Auto Orient");
 
             var enableEmissionToggle = inspector.GenerateToggle(this, container, "Enable Emission", nameof(enableEmission));
-            enableEmissionToggle.AddListenerFunction(_ => SetEnableEmission());
+            enableEmissionToggle.AddListenerFunction(SetEnableEmission);
 
             var emissionIntensityInputField = inspector.GenerateInputField(this, container, "Emission Intensity", nameof(emissionIntensity));
-            emissionIntensityInputField.AddListenerFunction(_ => SetEmissionIntensity());
+            emissionIntensityInputField.AddListenerFunction(SetEmissionIntensity);
             
             var themeBundleDropdown = inspector.GenerateDropdown(this, container, "Theme Bundle", ThemeBundleManager.instance.selectedThemeBundleList, nameof(materialThemeBundleName));
-            themeBundleDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(track));
+            themeBundleDropdown.AddListenerFunction(() => inspectorMain.SetInspector(track));
 
             if (materialThemeBundleName != String.Empty && ThemeBundleManager.instance.TryGetThemeBundle(materialThemeBundleName, out ThemeBundle themeBundle))
             {
                 List<string> materialNameList = themeBundle.assetList_Material.ConvertAll(x => x.name);
                 var objectNameDropdown = inspector.GenerateDropdown(this, container, "Material Name", materialNameList, nameof(materialName));
-                objectNameDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(track));
+                objectNameDropdown.AddListenerFunction(() => inspectorMain.SetInspector(track));
             }
             else
             {
@@ -229,19 +229,19 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Track Renderer Path Generator");
             
             var enableEmissionToggle = inspector.GenerateToggle(this, container, "Enable Emission", nameof(enableEmission));
-            enableEmissionToggle.AddListenerFunction(_ => SetEnableEmission());
+            enableEmissionToggle.AddListenerFunction(SetEnableEmission);
 
             var emissionIntensityInputField = inspector.GenerateInputField(this, container, "Emission Intensity", nameof(emissionIntensity));
-            emissionIntensityInputField.AddListenerFunction(_ => SetEmissionIntensity());
+            emissionIntensityInputField.AddListenerFunction(SetEmissionIntensity);
             
             var themeBundleDropdown = inspector.GenerateDropdown(this, container, "Theme Bundle", ThemeBundleManager.instance.selectedThemeBundleList, nameof(materialThemeBundleName));
-            themeBundleDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(track));
+            themeBundleDropdown.AddListenerFunction(()=>inspectorMain.SetInspector(track));
 
             if (materialThemeBundleName != String.Empty && ThemeBundleManager.instance.TryGetThemeBundle(materialThemeBundleName, out ThemeBundle themeBundle))
             {
                 List<string> materialNameList = themeBundle.assetList_Material.ConvertAll(x => x.name);
                 var objectNameDropdown = inspector.GenerateDropdown(this, container, "Material Name", materialNameList, nameof(materialName));
-                objectNameDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(track));
+                objectNameDropdown.AddListenerFunction(() => inspectorMain.SetInspector(track));
             }
             else
             {
@@ -313,6 +313,136 @@ namespace Ichni.RhythmGame
 
     #endregion
 
+    #region TubeGenerator
+
+    public class TrackRendererSubmoduleTubeGenerator : TrackRendererSubmodule
+    {
+        public TubeGenerator tubeGenerator;
+        public int sideCount;
+
+        public TrackRendererSubmoduleTubeGenerator(Track track, bool enableEmission, float emissionIntensity, int sideCount, Material material = null) :
+            base(track, enableEmission, emissionIntensity)
+        {
+            this.sideCount = sideCount;
+            
+            this.tubeGenerator = track.AddComponent<TubeGenerator>();
+            this.meshRenderer = tubeGenerator.GetComponent<MeshRenderer>();
+            this.meshGenerator = tubeGenerator;
+            this.renderMaterial = material == null ? EditorManager.instance.basePrefabs.defaultTrackMaterial : material;
+            this.tubeGenerator.spline = track.trackPathSubmodule.path;
+            this.tubeGenerator.clipFrom = 0;
+            this.tubeGenerator.clipTo = 1;
+            this.meshRenderer.material = renderMaterial;
+            this.tubeGenerator.color = Color.white;
+            this.tubeGenerator.uvRotation = 90;
+            this.tubeGenerator.sides = sideCount;
+        }
+        
+        public override void SaveBM()
+        {
+            matchedBM = new TrackRendererSubmoduleTubeGenerator_BM(attachedGameElement, this);
+        }
+        
+        public override void SetUpInspector()
+        {
+            IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
+            Inspector inspectorMain = EditorManager.instance.uiManager.inspector;
+            
+            var container = inspector.GenerateContainer("Track Renderer Tube Generator");
+            
+            var enableEmissionToggle = inspector.GenerateToggle(this, container, "Enable Emission", nameof(enableEmission));
+            enableEmissionToggle.AddListenerFunction(SetEnableEmission);
+
+            var emissionIntensityInputField = inspector.GenerateInputField(this, container, "Emission Intensity", nameof(emissionIntensity));
+            emissionIntensityInputField.AddListenerFunction(SetEmissionIntensity);
+            
+            var themeBundleDropdown = inspector.GenerateDropdown(this, container, "Theme Bundle", ThemeBundleManager.instance.selectedThemeBundleList, nameof(materialThemeBundleName));
+            themeBundleDropdown.AddListenerFunction(() => inspectorMain.SetInspector(track));
+
+            if (materialThemeBundleName != String.Empty && ThemeBundleManager.instance.TryGetThemeBundle(materialThemeBundleName, out ThemeBundle themeBundle))
+            {
+                List<string> materialNameList = themeBundle.assetList_Material.ConvertAll(x => x.name);
+                var objectNameDropdown = inspector.GenerateDropdown(this, container, "Material Name", materialNameList, nameof(materialName));
+                objectNameDropdown.AddListenerFunction(() => inspectorMain.SetInspector(track));
+            }
+            else
+            {
+                var objectNameDropdown = inspector.GenerateDropdown(this, container, "Material Name", new List<string>(), nameof(materialName));
+                objectNameDropdown.dropdown.interactable = false;
+            }
+            
+            var applyMaterialButton = inspector.GenerateButton(this, container, "Apply Material", () =>
+            {
+                ApplyMaterial(materialThemeBundleName, materialName);
+            });
+            
+            var sideCountInputField = inspector.GenerateInputField(this, container, "Side Count", nameof(sideCount));
+            sideCountInputField.AddListenerFunction(() =>
+            {
+                tubeGenerator.sides = sideCount;
+            });
+            
+            var deleteButton = inspector.GenerateButton(this, container, "Delete",
+                () =>
+                {
+                    Delete();
+                    track.trackRendererSubmodule = null;
+                    inspectorMain.SetInspector(track);
+                    track.Refresh();
+                });
+        }
+    }
+
+    namespace Beatmap
+    {
+        public class TrackRendererSubmoduleTubeGenerator_BM : Submodule_BM
+        {
+            public string materialThemeBundleName;
+            public string materialName;
+            public bool enableEmission;
+            public float emissionIntensity;
+            public int sideCount;
+
+            public TrackRendererSubmoduleTubeGenerator_BM()
+            {
+
+            }
+
+            public TrackRendererSubmoduleTubeGenerator_BM(GameElement attachedElement,
+                TrackRendererSubmoduleTubeGenerator trackRendererSubmodule) : base(attachedElement)
+            {
+                materialThemeBundleName = trackRendererSubmodule.materialThemeBundleName;
+                materialName = trackRendererSubmodule.materialName;
+                enableEmission = trackRendererSubmodule.enableEmission;
+                emissionIntensity = trackRendererSubmodule.emissionIntensity;
+                sideCount = trackRendererSubmodule.sideCount;
+            }
+
+            public override void ExecuteBM()
+            {
+                attachedElement = GameElement_BM.GetElement(attachedElementGuid);
+                Track track = attachedElement as Track;
+                track.trackRendererSubmodule = new TrackRendererSubmoduleTubeGenerator(track, enableEmission, emissionIntensity, sideCount);
+                if (materialName.Trim() != String.Empty)
+                {
+                    track.trackRendererSubmodule.ApplyMaterial(materialThemeBundleName, materialName);
+                }
+            }
+
+            public override void DuplicateBM(GameElement attached)
+            {
+                Track track = attached as Track;
+                track.trackRendererSubmodule = new TrackRendererSubmoduleTubeGenerator(track, enableEmission, emissionIntensity, sideCount);
+                if (materialName.Trim() != String.Empty)
+                {
+                    track.trackRendererSubmodule.ApplyMaterial(materialThemeBundleName, materialName);
+                }
+            }
+        }
+    }
+
+    #endregion
+
     #region Surface
 
     public class TrackRendererSubmoduleSurface : TrackRendererSubmodule
@@ -347,19 +477,19 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Track Renderer Surface");
 
             var enableEmissionToggle = inspector.GenerateToggle(this, container, "Enable Emission", nameof(enableEmission));
-            enableEmissionToggle.AddListenerFunction(_ => SetEnableEmission());
+            enableEmissionToggle.AddListenerFunction(SetEnableEmission);
 
             var emissionIntensityInputField = inspector.GenerateInputField(this, container, "Emission Intensity", nameof(emissionIntensity));
-            emissionIntensityInputField.AddListenerFunction(_ => SetEmissionIntensity());
+            emissionIntensityInputField.AddListenerFunction(SetEmissionIntensity);
 
             var themeBundleDropdown = inspector.GenerateDropdown(this, container, "Theme Bundle", ThemeBundleManager.instance.selectedThemeBundleList, nameof(materialThemeBundleName));
-            themeBundleDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(track));
+            themeBundleDropdown.AddListenerFunction(() => inspectorMain.SetInspector(track));
 
             if (materialThemeBundleName != String.Empty && ThemeBundleManager.instance.TryGetThemeBundle(materialThemeBundleName, out ThemeBundle themeBundle))
             {
                 List<string> materialNameList = themeBundle.assetList_Material.ConvertAll(x => x.name);
                 var objectNameDropdown = inspector.GenerateDropdown(this, container, "Material Name", materialNameList, nameof(materialName));
-                objectNameDropdown.AddListenerFunction(_ => inspectorMain.SetInspector(track));
+                objectNameDropdown.AddListenerFunction(() => inspectorMain.SetInspector(track));
             }
             else
             {
diff --git a/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackTimeSubmodule.cs b/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackTimeSubmodule.cs
index 348633a9..b80f4d10 100644
--- a/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackTimeSubmodule.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Track/TrackSubmodules/TrackTimeSubmodule.cs
@@ -75,17 +75,17 @@ namespace Ichni.RhythmGame
             var container = inspector.GenerateContainer("Track Time Movable");
             var startTimeInputField =
                 inspector.GenerateInputField(this, container, "Start Time", nameof(trackStartTime));
-            startTimeInputField.AddListenerFunction(_ => RefreshChildren());
+            startTimeInputField.AddListenerFunction(RefreshChildren);
             
             var endTimeInputField = inspector.GenerateInputField(this, container, "End Time", nameof(trackEndTime));
-            endTimeInputField.AddListenerFunction(_ => RefreshChildren());
+            endTimeInputField.AddListenerFunction(RefreshChildren);
             
             var visibleTimeInputField =
                 inspector.GenerateInputField(this, container, "Visible Time Length", nameof(visibleTrackTimeLength));
             
             var animationCurveDropdown = inspector.GenerateDropdown(this, container, "Animation Curve",
                 typeof(AnimationCurveType), nameof(animationCurveType));
-            animationCurveDropdown.AddListenerFunction(_ => RefreshChildren());
+            animationCurveDropdown.AddListenerFunction(RefreshChildren);
             
             var deleteButton = inspector.GenerateButton(this, container, "Delete",
                 () =>
diff --git a/Assets/Scripts/EditorGame/GameElements/Track/Trail.cs b/Assets/Scripts/EditorGame/GameElements/Track/Trail.cs
index 4dc897f4..29db0d04 100644
--- a/Assets/Scripts/EditorGame/GameElements/Track/Trail.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Track/Trail.cs
@@ -65,13 +65,13 @@ namespace Ichni.RhythmGame
             Inspector inspectorMain = EditorManager.instance.uiManager.inspector;
             var container = inspector.GenerateContainer("Trail");
             var visibleTimeLengthInputField = inspector.GenerateInputField(this, container, "Visible Time Length", nameof(visibleTimeLength));
-            visibleTimeLengthInputField.AddListenerFunction(_ => trailRenderer.time = visibleTimeLength);
+            visibleTimeLengthInputField.AddListenerFunction(() => trailRenderer.time = visibleTimeLength);
             
             var isAutoOrientToggle = inspector.GenerateToggle(this, container, "Is Auto Orient", nameof(isAutoOrient));
-            isAutoOrientToggle.AddListenerFunction(_ => trailRenderer.alignment = isAutoOrient ? LineAlignment.View : LineAlignment.TransformZ);
+            isAutoOrientToggle.AddListenerFunction(() => trailRenderer.alignment = isAutoOrient ? LineAlignment.View : LineAlignment.TransformZ);
             
             var widthMultiplierInputField = inspector.GenerateInputField(this, container, "Width Multiplier", nameof(widthMultiplier));
-            widthMultiplierInputField.AddListenerFunction(_ => trailRenderer.widthMultiplier = widthMultiplier);
+            widthMultiplierInputField.AddListenerFunction(() => trailRenderer.widthMultiplier = widthMultiplier);
             
             var widthCurveButton = inspector.GenerateButton(this, container, "Width Curve", () =>
             {
diff --git a/Assets/Scripts/Manager/SceneCamera.cs b/Assets/Scripts/Manager/SceneCamera.cs
index 5215dbc3..a0e0be62 100644
--- a/Assets/Scripts/Manager/SceneCamera.cs
+++ b/Assets/Scripts/Manager/SceneCamera.cs
@@ -30,9 +30,9 @@ namespace Ichni.Editor
             var viewTypeDropdown = inspector.GenerateDropdown(this, container, "View Type", typeof(GameCamera.CameraViewType), nameof(viewType));
             var perspectiveAngleField = inspector.GenerateInputField(this, container, "Perspective Angle", nameof(perspectiveAngle));
             var orthographicSizeField = inspector.GenerateInputField(this, container, "Orthographic Size", nameof(orthographicSize));
-            viewTypeDropdown.AddListenerFunction(_ => sceneCamera.orthographic = viewType == GameCamera.CameraViewType.Orthographic);
-            perspectiveAngleField.AddListenerFunction(_ => sceneCamera.fieldOfView = perspectiveAngle);
-            orthographicSizeField.AddListenerFunction(_ => sceneCamera.orthographicSize = orthographicSize);
+            viewTypeDropdown.AddListenerFunction(() => sceneCamera.orthographic = viewType == GameCamera.CameraViewType.Orthographic);
+            perspectiveAngleField.AddListenerFunction(() => sceneCamera.fieldOfView = perspectiveAngle);
+            orthographicSizeField.AddListenerFunction(() => sceneCamera.orthographicSize = orthographicSize);
 
             var positionInputFields = inspector.GenerateVector3InputField(this, container, "Position", nameof(cameraPosition), true);
             positionInputFields.AddListenerFunction(() => sceneCamera.transform.position = cameraPosition);
diff --git a/Assets/StreamingAssets/Projects/Terminal/Beatmap.json b/Assets/StreamingAssets/Projects/Terminal/Beatmap.json
index 4acb3af2..17283dcd 100644
--- a/Assets/StreamingAssets/Projects/Terminal/Beatmap.json
+++ b/Assets/StreamingAssets/Projects/Terminal/Beatmap.json
@@ -764,6 +764,137 @@
 					"attachedElementGuid" : {
 						"value" : "3f3e67c3-2771-498c-ae67-07baf315c418"
 					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Hold_BM,Assembly-CSharp",
+					"holdEndTime" : 1,
+					"exactJudgeTime" : 0.2,
+					"elementName" : "New Hold",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "029eae63-f59d-4520-9dbc-8aabd16c3cdc"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -1,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "029eae63-f59d-4520-9dbc-8aabd16c3cdc"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "029eae63-f59d-4520-9dbc-8aabd16c3cdc"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicHoldVisualStatic_BM,Assembly-CSharp",
+					"themeBundleName" : "basic",
+					"objectName" : "BasicNoteHoldStatic",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "591f7a09-8606-4615-b1d2-7cad18afc922"
+					},
+					"attachedElementGuid" : {
+						"value" : "029eae63-f59d-4520-9dbc-8aabd16c3cdc"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
+					"originalPosition" : {
+						"x" : 0,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalEulerAngles" : {
+						"x" : 0,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalScale" : {
+						"x" : 1,
+						"y" : 1,
+						"z" : 1
+					},
+					"attachedElementGuid" : {
+						"value" : "591f7a09-8606-4615-b1d2-7cad18afc922"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -1,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "591f7a09-8606-4615-b1d2-7cad18afc922"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp",
+					"originalBaseColor" : {
+						"r" : 1,
+						"g" : 1,
+						"b" : 1,
+						"a" : 1
+					},
+					"emissionEnabled" : false,
+					"originalEmissionColor" : {
+						"r" : 0,
+						"g" : 0,
+						"b" : 0,
+						"a" : 1
+					},
+					"originalEmissionIntensity" : 0,
+					"attachedElementGuid" : {
+						"value" : "591f7a09-8606-4615-b1d2-7cad18afc922"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp",
+					"effectCollection" : {"Generate":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteGenerateExpand_BM,Assembly-CSharp",
+								"generateTime" : 1,
+								"effectTime" : 0.1
+							}
+						],"GeneralJudge":[
+							
+						],"Holding":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteHoldingExpand_BM,Assembly-CSharp",
+								"effectTime" : 0.8
+							}
+						],"Perfect":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNotePerfectBurst_BM,Assembly-CSharp",
+								"effectTime" : 0.1
+							}
+						],"Good":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteGoodBurst_BM,Assembly-CSharp",
+								"effectTime" : 0.1
+							}
+						],"Bad":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteBadShrink_BM,Assembly-CSharp",
+								"effectTime" : 0.1
+							}
+						],"Miss":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteMissPale_BM,Assembly-CSharp",
+								"effectTime" : 0.2
+							}
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "591f7a09-8606-4615-b1d2-7cad18afc922"
+					}
 				}
 			],
 			"attachedElementGuid" : {
diff --git a/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/DirectionalLight.cs b/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/DirectionalLight.cs
index c9b33322..109b9856 100644
--- a/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/DirectionalLight.cs
+++ b/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/DirectionalLight.cs
@@ -53,10 +53,10 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
             var container = inspector.GenerateContainer("Directional Light");
 
             var intensityField = inspector.GenerateInputField(this, container, "Intensity", nameof(intensity));
-            intensityField.AddListenerFunction(_ => Refresh());
+            intensityField.AddListenerFunction(Refresh);
 
             var castShadowsToggle = inspector.GenerateToggle(this, container, "Cast Shadows", nameof(castShadows));
-            castShadowsToggle.AddListenerFunction(_ => Refresh());
+            castShadowsToggle.AddListenerFunction(Refresh);
         }
     }
 
diff --git a/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/PointLight.cs b/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/PointLight.cs
index 17696d29..de1c7d6f 100644
--- a/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/PointLight.cs
+++ b/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/PointLight.cs
@@ -56,13 +56,13 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
             var container = inspector.GenerateContainer("Directional Light");
 
             var intensityField = inspector.GenerateInputField(this, container, "Intensity", nameof(intensity));
-            intensityField.AddListenerFunction(_ => Refresh());
+            intensityField.AddListenerFunction(Refresh);
 
             var rangeField = inspector.GenerateInputField(this, container, "Range", nameof(range));
-            rangeField.AddListenerFunction(_ => Refresh());
+            rangeField.AddListenerFunction(Refresh);
 
             var castShadowsToggle = inspector.GenerateToggle(this, container, "Cast Shadows", nameof(castShadows));
-            castShadowsToggle.AddListenerFunction(_ => Refresh());
+            castShadowsToggle.AddListenerFunction(Refresh);
         }
     }