Timeline's Note And Sth Submodule

2025-03-16 00:42:27 +08:00
parent 7395319dfe
commit 41d944c9e1
15 changed files with 1000 additions and 94 deletions
--- a/3/Resources/ES3/ES3GlobalReferences.asset
+++ b/3/Resources/ES3/ES3GlobalReferences.asset
@@ -15,10 +15,8 @@ MonoBehaviour:
  refId:
    _Keys:
    - {fileID: 1919712600670392048, guid: 1eef181acaca89841a32060c68923043, type: 3}
-    - {fileID: 2800000, guid: a7ec9e7ad8b847b7ae4510af83c5d868, type: 3}
    - {fileID: 6297248396536211320, guid: 1eef181acaca89841a32060c68923043, type: 3}
    - {fileID: 8575234652331120996, guid: 1eef181acaca89841a32060c68923043, type: 3}
-    - {fileID: 2800000, guid: 02f78a9ec76d40f49bfac78c64a754d1, type: 3}
    - {fileID: 2100000, guid: 465ba4a268f5c4589a58ed35a13a75c4, type: 2}
    - {fileID: 7171625729032381852, guid: 1eef181acaca89841a32060c68923043, type: 3}
    - {fileID: 1629575301491717475, guid: 1eef181acaca89841a32060c68923043, type: 3}
@@ -27,8 +25,6 @@ MonoBehaviour:
    - {fileID: 6132576708022126925, guid: 2b134afea6d3d41b6989a409a5bcb2f3, type: 3}
    - {fileID: 2810288035678671647, guid: d00706ed05d0c4a55943214fad99b6cd, type: 3}
    - {fileID: 8147460192610872400, guid: 7440905e187024cd9ad8923844776f82, type: 3}
-    - {fileID: 2800000, guid: 3028dc075ba8c584d9bc7d1e0255e038, type: 3}
-    - {fileID: 2800000, guid: b0f85f7da5042c0448a526d5ecacbfa9, type: 3}
    - {fileID: 1956055908472055274, guid: c6a552686f72142bb8708e162c31d3ff, type: 3}
    - {fileID: 7531565761125080649, guid: c6a552686f72142bb8708e162c31d3ff, type: 3}
    - {fileID: 7337487027446299713, guid: c6a552686f72142bb8708e162c31d3ff, type: 3}
@@ -41,13 +37,6 @@ MonoBehaviour:
    - {fileID: 2800000, guid: 80694812942b91b42bc4aad99071ba7e, type: 3}
    - {fileID: 2800000, guid: 0b9510d2790829140953392aae2b6679, type: 3}
    - {fileID: 21300000, guid: 0b9510d2790829140953392aae2b6679, type: 3}
-    - {fileID: 2800000, guid: ee148e281f3c41c5b4ff5f8a5afe5a6c, type: 3}
-    - {fileID: 2800000, guid: 3ee40aa79cd242a5b53b0b0ca4f13f0f, type: 3}
-    - {fileID: 2800000, guid: 2fd6421f253b4ef1a19526541f9ffc0c, type: 3}
-    - {fileID: 2800000, guid: f66c4aa44c09b6a42a2b5b9f9334d824, type: 3}
-    - {fileID: 2800000, guid: 93f09189124b21e479fc891dbc1b93bf, type: 3}
-    - {fileID: 2800000, guid: dcc0ed9263c0d524aabeb5f4bd75ecee, type: 3}
-    - {fileID: 2800000, guid: 188dfe7e559f13248ba2c41eb5a59328, type: 3}
    - {fileID: 2800000, guid: f20112bdeec2e8d4d9f80e8390e37263, type: 3}
    - {fileID: 7671065637303904002, guid: f4b4e87edddc74e4e8d6b9d4cc0e31fc, type: 3}
    - {fileID: 7768496905287876572, guid: f4b4e87edddc74e4e8d6b9d4cc0e31fc, type: 3}
@@ -56,10 +45,29 @@ MonoBehaviour:
    - {fileID: 4800000, guid: da07703fcc09f8d4799221050659bd55, type: 3}
    - {fileID: -6465566751694194690, guid: ee7160752d2114149904ca2b2b012bbf, type: 3}
    - {fileID: 7671065637303904002, guid: df4a22c0fc7634babaac85c473d4b9fc, type: 3}
-    - {fileID: 2800000, guid: f87b5805002ec9649bcb1b96d8a16ba9, type: 3}
    - {fileID: 5502985463212138770, guid: df4a22c0fc7634babaac85c473d4b9fc, type: 3}
    - {fileID: 2890788359140629188, guid: df4a22c0fc7634babaac85c473d4b9fc, type: 3}
    - {fileID: 7768496905287876572, guid: df4a22c0fc7634babaac85c473d4b9fc, type: 3}
    - {fileID: 21300000, guid: c7353b93c0ea87c46af8eba38a20a636, type: 3}
    - {fileID: 2800000, guid: c7353b93c0ea87c46af8eba38a20a636, type: 3}
-    _Values: febc7fe765b0407bac90167906740a2a8c8e90345544ac394753b1a281922a4e7e358b9883b18c46114589015196ee4776dac15926adab1e4620c9a232d1ed566ec628c1efb3c0693a954d39e3d36066f7d0f7b20b638d2be0a95163e7ea141dcc1f6b7591d3a73ee5a8df6ea08ec51a799b52d05b53bb1a949134651819880de72e3b2ecf0dbc66f70629b01243766dcd4f9bcf7dee1e4185b3b64b611e3b6ddb9f15d3e773b400f9c3036d9fa280501bc798c97db9902b9e9549f346d5832eb56db8a23f89a7640733ce3e6d52283bf75ba0ec3738db26a8b1d7bde9c42f2998b1c6e5674f4d76eecb0c63a687616ba5f85375dbfd6b7da1d121924bab6f35b201cfe2da41f91439554f449eca2a0e0ae957f27d5ee2668ac131e2db057329631d4d0b8c6d0e3ae43753f6ee4b353bd2e2253bebcd1860a0d4110fb94b096df33eaacce4a3cf68897f3d09494eb639d80a18a0e72b703319371d8cc711425cd33b203e27204208f885cc092656e150e128c851cd967a1faedeb3ac8643a066
+    - {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
+    - {fileID: 4800000, guid: 423e4019c51e2433e94a8efed1980448, type: 3}
+    - {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+    - {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+    - {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
+    - {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+    - {fileID: 2800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    - {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
+    - {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+    - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+    - {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    - {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+    - {fileID: 2100000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    - {fileID: 10904, guid: 0000000000000000f000000000000000, type: 0}
+    - {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
+    - {fileID: 28684132378477856, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+    - {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
+    - {fileID: 28268798066460806, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
+    - {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+    - {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+    _Values: febc7fe765b0407b8c8e90345544ac394753b1a281922a4e114589015196ee4776dac15926adab1e4620c9a232d1ed566ec628c1efb3c0693a954d39e3d36066f7d0f7b20b638d2be0a95163e7ea141dcc1f6b7591d3a73e949134651819880de72e3b2ecf0dbc66f70629b01243766dcd4f9bcf7dee1e4185b3b64b611e3b6ddb9f15d3e773b400f9c3036d9fa280501bc798c97db9902b9e9549f346d5832eb56db8a23f89a7640733ce3e6d52283bf75ba0ec3738db260ae957f27d5ee2668ac131e2db057329631d4d0b8c6d0e3ae43753f6ee4b353bd2e2253bebcd1860a0d4110fb94b096df33eaacce4a3cf68897f3d09494eb63919371d8cc711425cd33b203e27204208f885cc092656e150e128c851cd967a1faedeb3ac8643a066696941ce49905954b063368dcbd19568dfd41e62741c9c0aa24726e7840a0343e00326e5bdac65587954269665689864e713ed6a2aafad56a7eda6d48a710f5ea039098a96961a33923a2536bdcc8f3956cf3dcf0690ce165927cb38a6b5d322f7c42dc76a0f38733adf6e4e962d5c724536aed9f37e2a0bdb44464957c307518d1d6d10b64b0a6e7bc20b8ff906d175ab6ca57cd054ac25fd0313370dae8377
--- a/Assets/Prefabs/DynamicUI/Timeline/SubTab.prefab
+++ b/Assets/Prefabs/DynamicUI/Timeline/SubTab.prefab
@@ -222,8 +222,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 8aff442fe127d534ba6f0236328cff84, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  connectObj: []
  button: {fileID: 5420725020538884635}
+  father: {fileID: 0}
  Time: 0
 --- !u!1 &9106615841642673279
 GameObject:
--- a/Assets/Prefabs/DynamicUI/Timeline/TimelimeTab.prefab
+++ b/Assets/Prefabs/DynamicUI/Timeline/TimelimeTab.prefab
@@ -172,7 +172,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 299.006, y: 25.652}
+  m_SizeDelta: {x: 300, y: 25}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2173865012283855025
 CanvasRenderer:
@@ -225,10 +225,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Title: {fileID: 4785562013637215009}
-  connectedGameElement: {fileID: 0}
  ElementPrefab: {fileID: 67623903627768998, guid: 43149b488eb37d14185b05d5d2ee0a9a,
    type: 3}
-  GelementPointer: []
  MoveArea: {fileID: 0}
  title: {fileID: 1420456342479727038}
  timeline: {fileID: 0}
--- a/Assets/Scenes/EditorScene.unity
+++ b/Assets/Scenes/EditorScene.unity
--- a/Assets/Scripts/DynamicUI/Hierarchy/Hierarchy.cs
+++ b/Assets/Scripts/DynamicUI/Hierarchy/Hierarchy.cs
@@ -31,10 +31,14 @@ namespace Ichni.Editor
            tabList.Add(tab);
            return tab;
        }
-        
+
        public void FindTab(GameElement targetElement, bool findparent = false)
        {
-            if (targetElement.connectedTab != null)
+            if (findparent && targetElement.connectedTab != null)
+            {
+                targetElement.connectedTab.expandButton.onClick.Invoke();
+            }
+            else if (targetElement.connectedTab != null)
            {
                targetElement.connectedTab.tabButton.onClick.Invoke();
            }
@@ -43,10 +47,7 @@ namespace Ichni.Editor
                FindTab(targetElement.parentElement, true);
            }

-            if (findparent && targetElement.connectedTab != null)
-            {
-                targetElement.connectedTab.expandButton.onClick.Invoke();
-            }
+
        }
    }
 }
--- a/Assets/Scripts/DynamicUI/Timeline/SubTab.cs
+++ b/Assets/Scripts/DynamicUI/Timeline/SubTab.cs
@@ -11,14 +11,15 @@ using UnityEngine.UI;

 public class SubTab : MonoBehaviour
 {
-    public List<GameElement> connectObj = new();
+    public List<IBaseElement> connectObj = new();
    public Button button;
    private SongInformation songInformation;
    private TimePointerModule timePointerModule;
    public TimelineTab father;
    private Timeline timeline;
    public float Time;
-    public void Set(GameElement Objs, float time)
+
+    public void Set(IBaseElement Objs, float time)
    {
        songInformation = EditorManager.instance.songInformation;
        timePointerModule = EditorManager.instance.uiManager.timeline.timePointerModule;
@@ -26,13 +27,22 @@ public class SubTab : MonoBehaviour
        Time = time;
        connectObj.Add(Objs);
        button.GetComponentInChildren<TMP_Text>().text = connectObj.Count().ToString();
-        transform.position = new Vector3(0, father.transform.position.y, 0);
-        transform.localPosition = new Vector3(Time / timeline.timePerBeat * timePointerModule.timePointerInterval + 15f - timePointerModule.delayDistanceOffset, 0, 0);
+
+        transform.localPosition = new Vector3(Time / timeline.timePerBeat * timePointerModule.timePointerInterval + 15f - timePointerModule.delayDistanceOffset,
+         -(42.5f + (father.TabIndex * 25)), 0);
+        //transform.position = new Vector3(transform.position.x, father.Title.transform.position.y, 0);
    }

-    public void GetClick()
+    public void GetClick()//?
    {
-        EditorManager.instance.uiManager.hierarchy.FindTab(connectObj[0]);
+        if (connectObj[0] is GameElement)
+        {
+            EditorManager.instance.uiManager.hierarchy.FindTab((GameElement)connectObj[0]);
+        }
+        else
+        {
+            EditorManager.instance.uiManager.hierarchy.FindTab(((SubmoduleBase)connectObj[0]).attachedGameElement);
+        }
    }


--- a/Assets/Scripts/DynamicUI/Timeline/TimePointerModule.cs
+++ b/Assets/Scripts/DynamicUI/Timeline/TimePointerModule.cs
@@ -56,7 +56,8 @@ namespace Ichni.Editor
                bool isActive = pointer.time >= leftSideSongTime && pointer.time <= rightSideSongTime;
                pointer.gameObject.SetActive(isActive);
            });
-            if (OnePointer != null) moveTabPoint.localPosition = new Vector3(timePointerArea.localPosition.x + OnePointer.transform.localPosition.x - timePointerInterval, -45f, 0);
+            if (OnePointer != null) moveTabPoint.localPosition =
+            new Vector3(timePointerArea.localPosition.x + OnePointer.transform.localPosition.x - timePointerInterval, 0, 0);

            foreach (var i in moveTabPoint.transform.GetComponentsInChildren<SubTab>())
            {
--- a/Assets/Scripts/DynamicUI/Timeline/Timeline.cs
+++ b/Assets/Scripts/DynamicUI/Timeline/Timeline.cs
@@ -110,8 +110,10 @@ namespace Ichni.Editor
    {
        public TimelineTab timelineTabPrefab;
        public Dictionary<Type, TimelineTab> timelineTabList = new Dictionary<Type, TimelineTab>();
+        private int TabIndex = 0;
        public void SetTimeLine(GameElement element)//暂时好了（别的类型什么的传时间就好了）
        {
+            TabIndex = 0;
            for (int i = timePointerModule.moveTabPoint.childCount - 1; i >= 0; i--)
            {
                var transform = timePointerModule.moveTabPoint.transform.GetChild(i);
@@ -123,35 +125,64 @@ namespace Ichni.Editor
                timelineTabList.Remove(timelineTabList.ElementAt(i).Key);
            }

-            Notefind(element);
+            Elementfind(element);


        }

        public RectTransform moveTabPoint;
-        public void Notefind(GameElement Track)
-        {//这也是if山
-            foreach (var i in Track.childElementList)
+        public void Elementfind(GameElement element)//在其中添加东西时timelineTab也要写（难受）
+        {
+
+            if (element.submoduleList.Any(w => w is TimeDurationSubmodule))
+            {
+                TimeDurationSubmodule sub = (TimeDurationSubmodule)element.submoduleList.Find(w => w is TimeDurationSubmodule);
+                if (sub.isOverridingDuration) Add(sub);
+            }
+
+            if (element is NoteBase)
+            {
+                if (!timelineTabList.ContainsKey(element.GetType()))
+                {
+                    Add(element);
+                }
+                else
+                {
+                    timelineTabList[element.GetType()].AddElement(element);
+                }
+            }
+            else if (element is Track track && track.submoduleList.Any(w => w is TrackTimeSubmodule))
+            {
+                TrackTimeSubmodule sub = (TrackTimeSubmodule)track.submoduleList.Find(w => w is TrackTimeSubmodule);
+                Add(sub);
+            }
+
+            foreach (var i in element.childElementList)
            {
                if (i is NoteBase)
                {
                    if (!timelineTabList.ContainsKey(i.GetType()))
                    {
-                        TimelineTab timelineTab = Instantiate(timelineTabPrefab, timelineTabRect.transform);
-                        //timelineTab.timeline = this;
-                        //timelineTab.MoveArea = timePointerModule.timePointerArea;
-                        timelineTab.MoveArea = moveTabPoint;
-                        timelineTab.SetTab(i, i.GetType());
-                        timelineTabList.Add(i.GetType(), timelineTab);
-
+                        Add(i);
                    }
                    else
                    {
-
                        timelineTabList[i.GetType()].AddElement(i);
                    }
                }
            }
        }
+        private void Add(IBaseElement obj)
+        {
+            TimelineTab timelineTab = Instantiate(timelineTabPrefab, timelineTabRect.transform);
+            timelineTab.MoveArea = moveTabPoint;
+            timelineTab.TabIndex = TabIndex;
+            timelineTab.SetTab(obj, obj.GetType());
+            timelineTabList.Add(obj.GetType(), timelineTab);
+
+            TabIndex++;
+        }
+
+
    }
 }
--- a/Assets/Scripts/DynamicUI/Timeline/TimelineTab.cs
+++ b/Assets/Scripts/DynamicUI/Timeline/TimelineTab.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using Ichni;
 using Ichni.Editor;
 using Ichni.RhythmGame;
@@ -11,42 +12,69 @@ using UnityEngine;
 public class TimelineTab : MonoBehaviour
 {
    public TMP_Text Title;
-    public GameElement connectedGameElement;
+    public IBaseElement connectedElement;

    public SubTab ElementPrefab;
-    public List<GameElement> GelementPointer;
+    public List<IBaseElement> GelementPointer = new();

    public RectTransform MoveArea;
    public RectTransform title;
    public Dictionary<float, SubTab> SubTabs = new();
-
+    public int TabIndex;
    public Timeline timeline;
-    public void SetTab(GameElement element, Type DisplayType)
+    public void SetTab(IBaseElement element, Type DisplayType)
    {
-        connectedGameElement = element;
-        Title.text = DisplayType.ToString();
+        connectedElement = element;
+        Title.text = DisplayType.ToString().Split('.').Last();

        AddElement(element);
    }
-    public void AddElement(GameElement gameElement)
+    public void AddElement(IBaseElement gameElement)
    {
-
+        if (gameElement == null)
+        {
+            return;
+        }
        GelementPointer.Add(gameElement);
-        if (gameElement is NoteBase)
+        if (gameElement is TimeDurationSubmodule suba)
+        {
+
+            AddSubTab(suba, suba.startTime);
+            AddSubTab(suba, suba.endTime);
+        }
+        else if (gameElement is TrackTimeSubmodule sub)
+        {
+            if (sub is TrackTimeSubmoduleMovable moveable)
+            {
+                AddSubTab(moveable, moveable.trackStartTime);
+                AddSubTab(moveable, moveable.trackEndTime);
+            }
+        }
+        else if (gameElement is NoteBase)
        {
            float Judgetime = ((NoteBase)gameElement).exactJudgeTime;
            print(Judgetime);

-            if (SubTabs.ContainsKey(Judgetime)) SubTabs[Judgetime].Set(gameElement, Judgetime);
+            if (SubTabs.ContainsKey(Judgetime))
+            {
+                SubTabs[Judgetime].Set(gameElement, Judgetime);
+            }
            else
            {
-                SubTab i = Instantiate(ElementPrefab, MoveArea.transform);
-                i.father = this;
-                i.Set(gameElement, Judgetime);
-                SubTabs.Add(Judgetime, i);
+                AddSubTab(gameElement, Judgetime);
            }
        }
    }
+
+    private void AddSubTab(IBaseElement element, float time)
+    {
+        SubTab subTab = Instantiate(ElementPrefab, MoveArea.transform);
+        subTab.father = this;
+        subTab.Set(element, time);
+        SubTabs.Add(time, subTab);
+
+    }
+
    private void Start()
    {
        timeline = EditorManager.instance.uiManager.timeline;
--- a/Assets/Scripts/EditorGame/Base/GeneralSubmodules/TimeDurationSubmodule.cs
+++ b/Assets/Scripts/EditorGame/Base/GeneralSubmodules/TimeDurationSubmodule.cs
@@ -12,53 +12,53 @@ namespace Ichni.RhythmGame
    {
        public bool isOverridingDuration; //是否手动设置了时间区间，开启时，子物体的时间区间将被忽略，且在自动计算区间时跳过此模块
        public float startTime, endTime; //起止时间
-        
+
        public TimeDurationSubmodule(GameElement attachedGameElement) : base(attachedGameElement)
        {
            isOverridingDuration = false;
-            startTime = -32767;//TODO: 换为-delay
-            endTime = 32767;//TODO: 换为songLength
+            startTime = -EditorManager.instance.songInformation.delay;//TODO: 换为-delay
+            endTime = EditorManager.instance.songInformation.songTime;//TODO: 换为songLength

            (attachedGameElement as IHaveTimeDurationSubmodule).timeDurationSubmodule = this;
        }
-        
+
        public TimeDurationSubmodule(GameElement attachedGameElement, bool isOverridingDuration, float startTime, float endTime) : base(attachedGameElement)
        {
            this.isOverridingDuration = isOverridingDuration;
            this.startTime = startTime;
            this.endTime = endTime;
-            
+
            (attachedGameElement as IHaveTimeDurationSubmodule).timeDurationSubmodule = this;
        }
-        
+
        public bool CheckTimeInDuration(float time, float offset = 0.2f)
        {
            return time >= startTime - offset && time <= endTime + offset;
        }
-        
+
        public void SetDuration(float startTime, float endTime)
        {
            this.startTime = startTime;
            this.endTime = endTime;
            this.isOverridingDuration = true;
        }
-        
+
        public void SetDuration(params FlexibleFloat[] flexibleFloats)
        {
            List<float> startTimes = new List<float>();
            List<float> endTimes = new List<float>();
-            
+
            foreach (FlexibleFloat flexibleFloat in flexibleFloats)
            {
                flexibleFloat.Sort();
-                
+
                if (flexibleFloat.animations.Count > 0)
                {
                    startTimes.Add(flexibleFloat.animations[0].startTime);
                    endTimes.Add(flexibleFloat.animations[^1].endTime);
                }
            }
-            
+
            startTime = startTimes.Min();
            endTime = endTimes.Max();
        }
@@ -102,19 +102,19 @@ namespace Ichni.RhythmGame
                startTimeInputField.inputField.interactable = interactable;
                endTimeInputField.inputField.interactable = interactable;
            }
-            
+
            SetInputFieldInteractable(isOverridingDuration);
            overrideToggle.AddListenerFunction(SetInputFieldInteractable);
        }

-        
+
    }

    public interface IHaveTimeDurationSubmodule
    {
        public TimeDurationSubmodule timeDurationSubmodule { get; set; }
    }
-    
+
    namespace Beatmap
    {
        public class TimeDurationSubmodule_BM : Submodule_BM
@@ -124,7 +124,7 @@ namespace Ichni.RhythmGame

            public TimeDurationSubmodule_BM()
            {
-                
+
            }

            public TimeDurationSubmodule_BM(GameElement attachedElement) : base(attachedElement)
@@ -142,7 +142,7 @@ namespace Ichni.RhythmGame
            }

            public override void DuplicateBM(GameElement attached)
-            { 
+            {
                (attached as IHaveTimeDurationSubmodule).timeDurationSubmodule = new TimeDurationSubmodule(attached, isOverridingDuration, startTime, endTime);
            }
        }
--- a/Assets/Scripts/FirmStartMenu.cs
+++ b/Assets/Scripts/FirmStartMenu.cs
@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor.SearchService;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class FirmStartMenu : MonoBehaviour
+{
+    [RuntimeInitializeOnLoadMethod]
+    static void Initialize()
+    {
+        string startSceneName = "StartMenu";
+        UnityEngine.SceneManagement.Scene scene = SceneManager.GetActiveScene();
+        if (scene.name.Equals(startSceneName))
+        {
+            return;
+        }
+        SceneManager.LoadScene(startSceneName);
+    }
+}
--- a/Assets/Scripts/FirmStartMenu.cs.meta
+++ b/Assets/Scripts/FirmStartMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cfc19c624e3139f488c44f94b51da5ad
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/StreamingAssets/AutoSave/IceFlowerMaster/AutoSave_0.json
+++ b/Assets/StreamingAssets/AutoSave/IceFlowerMaster/AutoSave_0.json
@@ -99,7 +99,7 @@
 					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
 					"originalPosition" : {
 						"x" : 0,
-						"y" : 0,
+						"y" : 30,
 						"z" : 0
 					},
 					"originalEulerAngles" : {
@@ -128,7 +128,7 @@
 					"trackSpaceType" : 2,
 					"trackSamplingType" : 0,
 					"isClosed" : false,
-					"isShowingDisplay" : false,
+					"isShowingDisplay" : true,
 					"attachedElementGuid" : {
 						"value" : "692022b5-74c9-4593-b3f7-7b8f77225288"
 					}
@@ -644,8 +644,8 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
-					"isOverridingDuration" : false,
-					"startTime" : -32767,
+					"isOverridingDuration" : true,
+					"startTime" : 1,
 					"endTime" : 32767,
 					"attachedElementGuid" : {
 						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
@@ -994,7 +994,7 @@
 						"animatedFloatList" : [
 							{
 								"startValue" : 0,
-								"endValue" : 360,
+								"endValue" : 0,
 								"startTime" : 0,
 								"endTime" : 10,
 								"animationCurveType" : 0
@@ -1579,6 +1579,628 @@
 					"attachedElementGuid" : {
 						"value" : "666f6065-2ef3-480f-ba22-da01e6cfe25f"
 					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 1,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "2f07b15d-a8a4-49a1-a3d5-1ea149e23c13"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "2f07b15d-a8a4-49a1-a3d5-1ea149e23c13"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "2f07b15d-a8a4-49a1-a3d5-1ea149e23c13"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 2,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "38b5ba8d-a8c9-41f5-9c79-c6c312ba4ffd"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "38b5ba8d-a8c9-41f5-9c79-c6c312ba4ffd"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "38b5ba8d-a8c9-41f5-9c79-c6c312ba4ffd"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 3,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "42585823-d436-4c1d-b331-deaf73b5b77b"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "42585823-d436-4c1d-b331-deaf73b5b77b"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "42585823-d436-4c1d-b331-deaf73b5b77b"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteVisual_BM,Assembly-CSharp",
+					"themeBundleName" : "basic",
+					"objectName" : "BasicNoteTap3D",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "00e64ad0-eed9-4a64-9dd8-237d477a1efe"
+					},
+					"attachedElementGuid" : {
+						"value" : "42585823-d436-4c1d-b331-deaf73b5b77b"
+					}
+				},{
+					"__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" : "00e64ad0-eed9-4a64-9dd8-237d477a1efe"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0.6293197,
+					"attachedElementGuid" : {
+						"value" : "00e64ad0-eed9-4a64-9dd8-237d477a1efe"
+					}
+				},{
+					"__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" : "00e64ad0-eed9-4a64-9dd8-237d477a1efe"
+					}
+				},{
+					"__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":[
+							
+						],"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.BasicNoteBadExpand_BM,Assembly-CSharp",
+								"effectTime" : 0.1
+							}
+						],"Miss":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteMissPale_BM,Assembly-CSharp",
+								"effectTime" : 0.2
+							}
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "00e64ad0-eed9-4a64-9dd8-237d477a1efe"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteVisual_BM,Assembly-CSharp",
+					"themeBundleName" : "basic",
+					"objectName" : "BasicNoteTap3D",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "d20eb13b-ee64-4a16-ae55-25a9cca4d686"
+					},
+					"attachedElementGuid" : {
+						"value" : "38b5ba8d-a8c9-41f5-9c79-c6c312ba4ffd"
+					}
+				},{
+					"__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" : "d20eb13b-ee64-4a16-ae55-25a9cca4d686"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0.6293197,
+					"attachedElementGuid" : {
+						"value" : "d20eb13b-ee64-4a16-ae55-25a9cca4d686"
+					}
+				},{
+					"__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" : "d20eb13b-ee64-4a16-ae55-25a9cca4d686"
+					}
+				},{
+					"__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":[
+							
+						],"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.BasicNoteBadExpand_BM,Assembly-CSharp",
+								"effectTime" : 0.1
+							}
+						],"Miss":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteMissPale_BM,Assembly-CSharp",
+								"effectTime" : 0.2
+							}
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "d20eb13b-ee64-4a16-ae55-25a9cca4d686"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteVisual_BM,Assembly-CSharp",
+					"themeBundleName" : "basic",
+					"objectName" : "BasicNoteTap3D",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "d896d29a-8f29-4674-80ad-8cba3e11b39c"
+					},
+					"attachedElementGuid" : {
+						"value" : "2f07b15d-a8a4-49a1-a3d5-1ea149e23c13"
+					}
+				},{
+					"__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" : "d896d29a-8f29-4674-80ad-8cba3e11b39c"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0.6293197,
+					"attachedElementGuid" : {
+						"value" : "d896d29a-8f29-4674-80ad-8cba3e11b39c"
+					}
+				},{
+					"__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" : "d896d29a-8f29-4674-80ad-8cba3e11b39c"
+					}
+				},{
+					"__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":[
+							
+						],"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.BasicNoteBadExpand_BM,Assembly-CSharp",
+								"effectTime" : 0.1
+							}
+						],"Miss":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteMissPale_BM,Assembly-CSharp",
+								"effectTime" : 0.2
+							}
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "d896d29a-8f29-4674-80ad-8cba3e11b39c"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 1,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "866ecf8b-155e-4ca0-88cd-a1a45e49fb0c"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "866ecf8b-155e-4ca0-88cd-a1a45e49fb0c"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "866ecf8b-155e-4ca0-88cd-a1a45e49fb0c"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteVisual_BM,Assembly-CSharp",
+					"themeBundleName" : "basic",
+					"objectName" : "BasicNoteTap3D",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "2a9a9443-b78c-4ad7-8ecd-f0e228a55c46"
+					},
+					"attachedElementGuid" : {
+						"value" : "866ecf8b-155e-4ca0-88cd-a1a45e49fb0c"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
+					"originalPosition" : {
+						"x" : 4,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalEulerAngles" : {
+						"x" : 0,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalScale" : {
+						"x" : 1,
+						"y" : 1,
+						"z" : 1
+					},
+					"attachedElementGuid" : {
+						"value" : "2a9a9443-b78c-4ad7-8ecd-f0e228a55c46"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0.6293197,
+					"attachedElementGuid" : {
+						"value" : "2a9a9443-b78c-4ad7-8ecd-f0e228a55c46"
+					}
+				},{
+					"__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" : "2a9a9443-b78c-4ad7-8ecd-f0e228a55c46"
+					}
+				},{
+					"__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":[
+							
+						],"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.BasicNoteBadExpand_BM,Assembly-CSharp",
+								"effectTime" : 0.1
+							}
+						],"Miss":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteMissPale_BM,Assembly-CSharp",
+								"effectTime" : 0.2
+							}
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "2a9a9443-b78c-4ad7-8ecd-f0e228a55c46"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Stay_BM,Assembly-CSharp",
+					"exactJudgeTime" : 2.22,
+					"elementName" : "New Stay",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "1db3fed5-54ec-43e0-b133-8487b9e281fb"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "1db3fed5-54ec-43e0-b133-8487b9e281fb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						{
+							"__type" : "Ichni.RhythmGame.Beatmap.TouchAreaJudgeUnit_BM,Assembly-CSharp",
+							"areaRadius" : 1000
+						}
+					],
+					"attachedElementGuid" : {
+						"value" : "1db3fed5-54ec-43e0-b133-8487b9e281fb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"themeBundleName" : "departure_to_multiverse",
+					"objectName" : "DTM_NoteVisualStay",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "c00b2f77-649c-4c63-ab2b-1bf79840404e"
+					},
+					"attachedElementGuid" : {
+						"value" : "1db3fed5-54ec-43e0-b133-8487b9e281fb"
+					}
+				},{
+					"__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" : "c00b2f77-649c-4c63-ab2b-1bf79840404e"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "c00b2f77-649c-4c63-ab2b-1bf79840404e"
+					}
+				},{
+					"__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" : "c00b2f77-649c-4c63-ab2b-1bf79840404e"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp",
+					"effectCollection" : {"Generate":[
+							
+						],"GeneralJudge":[
+							
+						],"Holding":[
+							
+						],"Perfect":[
+							
+						],"Good":[
+							
+						],"Bad":[
+							
+						],"Miss":[
+							
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "c00b2f77-649c-4c63-ab2b-1bf79840404e"
+					}
 				}
 			],
 			"attachedElementGuid" : {
--- a/Assets/StreamingAssets/Projects/IceFlowerMaster/Beatmap.json
+++ b/Assets/StreamingAssets/Projects/IceFlowerMaster/Beatmap.json
@@ -99,7 +99,7 @@
 					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
 					"originalPosition" : {
 						"x" : 0,
-						"y" : 0,
+						"y" : 30,
 						"z" : 0
 					},
 					"originalEulerAngles" : {
@@ -128,7 +128,7 @@
 					"trackSpaceType" : 2,
 					"trackSamplingType" : 0,
 					"isClosed" : false,
-					"isShowingDisplay" : false,
+					"isShowingDisplay" : true,
 					"attachedElementGuid" : {
 						"value" : "692022b5-74c9-4593-b3f7-7b8f77225288"
 					}
@@ -994,7 +994,7 @@
 						"animatedFloatList" : [
 							{
 								"startValue" : 0,
-								"endValue" : 360,
+								"endValue" : 0,
 								"startTime" : 0,
 								"endTime" : 10,
 								"animationCurveType" : 0
@@ -1579,6 +1579,93 @@
 					"attachedElementGuid" : {
 						"value" : "666f6065-2ef3-480f-ba22-da01e6cfe25f"
 					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 1,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "2f07b15d-a8a4-49a1-a3d5-1ea149e23c13"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "2f07b15d-a8a4-49a1-a3d5-1ea149e23c13"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "2f07b15d-a8a4-49a1-a3d5-1ea149e23c13"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 2,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "38b5ba8d-a8c9-41f5-9c79-c6c312ba4ffd"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "38b5ba8d-a8c9-41f5-9c79-c6c312ba4ffd"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "38b5ba8d-a8c9-41f5-9c79-c6c312ba4ffd"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 3,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "42585823-d436-4c1d-b331-deaf73b5b77b"
+					},
+					"attachedElementGuid" : {
+						"value" : "9ff48934-6aa3-47fa-9957-b9805b738495"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : 0,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "42585823-d436-4c1d-b331-deaf73b5b77b"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "42585823-d436-4c1d-b331-deaf73b5b77b"
+					}
 				}
 			],
 			"attachedElementGuid" : {
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -8,4 +8,7 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/EditorScene.unity
    guid: 99c9720ab356a0642a771bea13969a05
+  - enabled: 1
+    path: Assets/Scenes/StartMenu.unity
+    guid: 28c134965d47644a98d3ba8a1343674a
  m_configObjects: {}