non-strip hold完成

2025-03-16 20:19:04 -04:00
parent 4aad7b3882
commit 1c2e703bbc
25 changed files with 1353 additions and 3026 deletions
--- a/Assets/000_assets/shader.meta
+++ b/Assets/000_assets/shader.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 59f7065eb24bb4a339f5005ea9baec7a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/GameElements/Track/DefaultTrackMaterial.mat
+++ b/Assets/Prefabs/GameElements/Track/DefaultTrackMaterial.mat
@@ -8,7 +8,7 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: DefaultTrackMaterial
-  m_Shader: {fileID: 4800000, guid: 423e4019c51e2433e94a8efed1980448, type: 3}
+  m_Shader: {fileID: 4800000, guid: 44e8d6dab1446644688189717537509a, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords: []
--- a/Assets/Prefabs/GameElements/Track/DefaultTrailMaterial.mat
+++ b/Assets/Prefabs/GameElements/Track/DefaultTrailMaterial.mat
@@ -8,7 +8,7 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: DefaultTrailMaterial
-  m_Shader: {fileID: 4800000, guid: 423e4019c51e2433e94a8efed1980448, type: 3}
+  m_Shader: {fileID: 4800000, guid: 44e8d6dab1446644688189717537509a, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords: []
--- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs
@@ -13,7 +13,9 @@ namespace Ichni.RhythmGame
    public partial class Hold : NoteBase
    {
        public float holdEndTime;
+        public float holdingTime;
        public bool isHolding;
+        public bool isFinalJudged;
        
        public static Hold GenerateElement(string elementName, Guid id, List<string> tags, bool isFirstGenerated,
            GameElement parentElement, float exactJudgeTime, float holdEndTime)
@@ -23,6 +25,7 @@ namespace Ichni.RhythmGame
            hold.Initialize(elementName, id, tags, isFirstGenerated, parentElement);
            hold.exactJudgeTime = exactJudgeTime;
            hold.holdEndTime = holdEndTime;
+            hold.holdingTime = 0;

            if (parentElement.TryGetComponent(out Track track))
            {
@@ -48,6 +51,31 @@ namespace Ichni.RhythmGame
            return hold;
        }
    }
+
+    public partial class Hold
+    {
+        public override void UpdateNoteInMovableTrack()
+        {
+            if (!isHolding && !isFinalJudged)
+            {
+                base.UpdateNoteInMovableTrack();
+            }
+
+            if (noteVisual is NoteVisualBaseHold noteVisualHold)
+            {
+                noteVisualHold.UpdateHoldInMovableTrack();
+            }
+        }
+
+        public override void UpdateNoteInStaticTrack()
+        {
+            base.UpdateNoteInStaticTrack();
+            if (noteVisual is NoteVisualBaseHold noteVisualHold)
+            {
+                noteVisualHold.UpdateHoldInStaticTrack();
+            }
+        }
+    }
    
    public partial class Hold
    {
@@ -92,10 +120,7 @@ namespace Ichni.RhythmGame
            
            if (isOnTrack)
            {
-                if (track.trackTimeSubmodule is TrackTimeSubmoduleStatic)
-                {
-                    UpdateNoteInStaticTrack();
-                }
+                UpdateNoteInTrack();
            }

            float songTime = EditorManager.instance.songInformation.songTime;
@@ -104,11 +129,19 @@ namespace Ichni.RhythmGame
            {
                isFirstJudged = false;
                isHolding = false;
+                isFinalJudged = false;
+                holdingTime = 0;
+            }
+            
+            if (isHolding)
+            {
+                holdingTime = songTime - exactJudgeTime;
            }
            
            if (isHolding && songTime > holdEndTime)
            {
                isHolding = false;
+                isFinalJudged = true;
            }

            if (!isFirstJudged && songTime >= exactJudgeTime)
--- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs
+++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs
@@ -7,6 +7,16 @@ namespace Ichni.RhythmGame
 {
    public class NoteVisualBaseHold : NoteVisualBase
    {
+        public Hold hold;
        
+        public virtual void UpdateHoldInMovableTrack()
+        {
+            
+        }
+        
+        public virtual void UpdateHoldInStaticTrack()
+        {
+            
+        }
    }
 }
--- a/Assets/Shaders/Sprite
+++ b/Assets/Shaders/Sprite
--- a/Unlit.shadergraph.meta
+++ b/Unlit.shadergraph.meta
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: ee7160752d2114149904ca2b2b012bbf
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Assets/Shaders/TrackShader.shader
+++ b/Assets/Shaders/TrackShader.shader
@@ -6,10 +6,10 @@ Shader "Soullies/TrackShader"
 	{
 		[HideInInspector] _AlphaCutoff("Alpha Cutoff ", Range(0, 1)) = 0.5
 		_MainTexture("MainTexture", 2D) = "white" {}
-		_BaseColor("BaseColor", Color) = (0,0,0,0)
-		_UseRedAsAlpha("UseRedAsAlpha", Int) = 0
-		_Emission("Emission", Int) = 0
-		_EmissionColor("EmissionColor", Color) = (0,0,0,0)
+		[HDR]_BaseColor("BaseColor", Color) = (0,0,0,0)
+		[HDR]_EmissionColor("EmissionColor", Color) = (0,0,0,0)
+		[Toggle(_USEREDASALPHA_ON)] _UseRedAsAlpha("UseRedAsAlpha", Float) = 1
+		[Toggle(_EMISSION_ON)] _Emission("Emission", Float) = 1
 		[HideInInspector] _texcoord( "", 2D ) = "white" {}

 		[HideInInspector][NoScaleOffset] unity_Lightmaps("unity_Lightmaps", 2DArray) = "" {}
@@ -70,15 +70,15 @@ Shader "Soullies/TrackShader"
 			#include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/SurfaceData2D.hlsl"
 			#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging2D.hlsl"

-			
+			#pragma shader_feature_local _USEREDASALPHA_ON
+			#pragma shader_feature_local _EMISSION_ON
+

 			sampler2D _MainTexture;
 			CBUFFER_START( UnityPerMaterial )
 			float4 _MainTexture_ST;
 			float4 _BaseColor;
 			float4 _EmissionColor;
-			int _Emission;
-			int _UseRedAsAlpha;
 			CBUFFER_END


@@ -151,10 +151,20 @@ Shader "Soullies/TrackShader"

 				float2 uv_MainTexture = IN.texCoord0.xy * _MainTexture_ST.xy + _MainTexture_ST.zw;
 				float4 break10 = tex2D( _MainTexture, uv_MainTexture );
-				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a )));
-				float4 temp_output_14_0 = ( appendResult13 * _BaseColor );
+				#ifdef _USEREDASALPHA_ON
+				float staticSwitch28 = break10.r;
+				#else
+				float staticSwitch28 = break10.a;
+				#endif
+				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28));
+				float4 temp_cast_0 = (1.0).xxxx;
+				#ifdef _EMISSION_ON
+				float4 staticSwitch29 = _EmissionColor;
+				#else
+				float4 staticSwitch29 = temp_cast_0;
+				#endif
 				
-				float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 );
+				float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 );

 				#if ETC1_EXTERNAL_ALPHA
 					float4 alpha = SAMPLE_TEXTURE2D( _AlphaTex, sampler_AlphaTex, IN.texCoord0.xy );
@@ -218,15 +228,15 @@ Shader "Soullies/TrackShader"
 			#include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/SurfaceData2D.hlsl"
 			#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging2D.hlsl"

-			
+			#pragma shader_feature_local _USEREDASALPHA_ON
+			#pragma shader_feature_local _EMISSION_ON
+

 			sampler2D _MainTexture;
 			CBUFFER_START( UnityPerMaterial )
 			float4 _MainTexture_ST;
 			float4 _BaseColor;
 			float4 _EmissionColor;
-			int _Emission;
-			int _UseRedAsAlpha;
 			CBUFFER_END


@@ -299,10 +309,20 @@ Shader "Soullies/TrackShader"

 				float2 uv_MainTexture = IN.texCoord0.xy * _MainTexture_ST.xy + _MainTexture_ST.zw;
 				float4 break10 = tex2D( _MainTexture, uv_MainTexture );
-				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a )));
-				float4 temp_output_14_0 = ( appendResult13 * _BaseColor );
+				#ifdef _USEREDASALPHA_ON
+				float staticSwitch28 = break10.r;
+				#else
+				float staticSwitch28 = break10.a;
+				#endif
+				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28));
+				float4 temp_cast_0 = (1.0).xxxx;
+				#ifdef _EMISSION_ON
+				float4 staticSwitch29 = _EmissionColor;
+				#else
+				float4 staticSwitch29 = temp_cast_0;
+				#endif
 				
-				float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 );
+				float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 );

 				#if ETC1_EXTERNAL_ALPHA
 					float4 alpha = SAMPLE_TEXTURE2D( _AlphaTex, sampler_AlphaTex, IN.texCoord0.xy );
@@ -364,15 +384,15 @@ Shader "Soullies/TrackShader"
 			#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl"
 			#include "Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShaderPass.hlsl"

-			
+			#pragma shader_feature_local _USEREDASALPHA_ON
+			#pragma shader_feature_local _EMISSION_ON
+

 			sampler2D _MainTexture;
 			CBUFFER_START( UnityPerMaterial )
 			float4 _MainTexture_ST;
 			float4 _BaseColor;
 			float4 _EmissionColor;
-			int _Emission;
-			int _UseRedAsAlpha;
 			CBUFFER_END


@@ -431,10 +451,20 @@ Shader "Soullies/TrackShader"
 			{
 				float2 uv_MainTexture = IN.ase_texcoord.xy * _MainTexture_ST.xy + _MainTexture_ST.zw;
 				float4 break10 = tex2D( _MainTexture, uv_MainTexture );
-				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a )));
-				float4 temp_output_14_0 = ( appendResult13 * _BaseColor );
+				#ifdef _USEREDASALPHA_ON
+				float staticSwitch28 = break10.r;
+				#else
+				float staticSwitch28 = break10.a;
+				#endif
+				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28));
+				float4 temp_cast_0 = (1.0).xxxx;
+				#ifdef _EMISSION_ON
+				float4 staticSwitch29 = _EmissionColor;
+				#else
+				float4 staticSwitch29 = temp_cast_0;
+				#endif
 				
-				float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 );
+				float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 );

 				half4 outColor = half4(_ObjectId, _PassValue, 1.0, 1.0);
 				return outColor;
@@ -476,15 +506,15 @@ Shader "Soullies/TrackShader"
 			#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl"
 			#include "Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShaderPass.hlsl"

-        	
+        	#pragma shader_feature_local _USEREDASALPHA_ON
+        	#pragma shader_feature_local _EMISSION_ON
+

 			sampler2D _MainTexture;
 			CBUFFER_START( UnityPerMaterial )
 			float4 _MainTexture_ST;
 			float4 _BaseColor;
 			float4 _EmissionColor;
-			int _Emission;
-			int _UseRedAsAlpha;
 			CBUFFER_END


@@ -541,10 +571,20 @@ Shader "Soullies/TrackShader"
 			{
 				float2 uv_MainTexture = IN.ase_texcoord.xy * _MainTexture_ST.xy + _MainTexture_ST.zw;
 				float4 break10 = tex2D( _MainTexture, uv_MainTexture );
-				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a )));
-				float4 temp_output_14_0 = ( appendResult13 * _BaseColor );
+				#ifdef _USEREDASALPHA_ON
+				float staticSwitch28 = break10.r;
+				#else
+				float staticSwitch28 = break10.a;
+				#endif
+				float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28));
+				float4 temp_cast_0 = (1.0).xxxx;
+				#ifdef _EMISSION_ON
+				float4 staticSwitch29 = _EmissionColor;
+				#else
+				float4 staticSwitch29 = temp_cast_0;
+				#endif
 				
-				float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 );
+				float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 );
 				half4 outColor = _SelectionID;
 				return outColor;
 			}
@@ -559,36 +599,33 @@ Shader "Soullies/TrackShader"
 }
 /*ASEBEGIN
 Version=19501
-Node;AmplifyShaderEditor.SamplerNode;6;-912,-256;Inherit;True;Property;_MainTexture;MainTexture;0;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5
-Node;AmplifyShaderEditor.BreakToComponentsNode;10;-592,-256;Inherit;False;COLOR;1;0;COLOR;0,0,0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15
-Node;AmplifyShaderEditor.IntNode;12;-672,-480;Inherit;False;Property;_UseRedAsAlpha;UseRedAsAlpha;2;0;Create;True;0;0;0;False;0;False;0;0;False;0;1;INT;0
-Node;AmplifyShaderEditor.Compare;18;-416,-480;Inherit;False;0;4;0;INT;0;False;1;FLOAT;1;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SamplerNode;6;-992,-272;Inherit;True;Property;_MainTexture;MainTexture;0;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5
+Node;AmplifyShaderEditor.BreakToComponentsNode;10;-672,-272;Inherit;False;COLOR;1;0;COLOR;0,0,0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15
+Node;AmplifyShaderEditor.StaticSwitch;28;-512,-160;Inherit;False;Property;_UseRedAsAlpha;UseRedAsAlpha;3;0;Create;True;0;0;0;False;0;False;0;1;1;True;;Toggle;2;Key0;Key1;Create;True;True;All;9;1;FLOAT;0;False;0;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;6;FLOAT;0;False;7;FLOAT;0;False;8;FLOAT;0;False;1;FLOAT;0
 Node;AmplifyShaderEditor.DynamicAppendNode;13;-192,-288;Inherit;False;COLOR;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;COLOR;0
-Node;AmplifyShaderEditor.ColorNode;8;-256,-112;Inherit;False;Property;_BaseColor;BaseColor;1;0;Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5
+Node;AmplifyShaderEditor.RangedFloatNode;30;-48,0;Inherit;False;Constant;_Float0;Float 0;6;0;Create;True;0;0;0;False;0;False;1;0;0;0;0;1;FLOAT;0
+Node;AmplifyShaderEditor.ColorNode;8;-368,-16;Inherit;False;Property;_BaseColor;BaseColor;1;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5
+Node;AmplifyShaderEditor.ColorNode;20;-96,128;Inherit;False;Property;_EmissionColor;EmissionColor;2;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5
 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;14;-16,-192;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0
-Node;AmplifyShaderEditor.ColorNode;20;-80,96;Inherit;False;Property;_EmissionColor;EmissionColor;4;0;Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5
-Node;AmplifyShaderEditor.IntNode;17;139.8661,-417.2427;Inherit;False;Property;_Emission;Emission;3;0;Create;True;0;0;0;False;0;False;0;0;False;0;1;INT;0
-Node;AmplifyShaderEditor.SimpleMultiplyOpNode;21;192,-112;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0
-Node;AmplifyShaderEditor.Compare;16;384,-320;Inherit;False;0;4;0;INT;0;False;1;FLOAT;1;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;1;COLOR;0
+Node;AmplifyShaderEditor.StaticSwitch;29;144,-32;Inherit;False;Property;_Emission;Emission;4;0;Create;True;0;0;0;False;0;False;0;1;1;True;;Toggle;2;Key0;Key1;Create;True;True;All;9;1;COLOR;0,0,0,0;False;0;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;4;COLOR;0,0,0,0;False;5;COLOR;0,0,0,0;False;6;COLOR;0,0,0,0;False;7;COLOR;0,0,0,0;False;8;COLOR;0,0,0,0;False;1;COLOR;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;21;416,-144;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0
 Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;3;0,0;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit Forward;0;1;Sprite Unlit Forward;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;False;True;1;False;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=UniversalForward;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0
 Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;4;0,0;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;SceneSelectionPass;0;2;SceneSelectionPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=SceneSelectionPass;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0
 Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;5;0,0;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;ScenePickingPass;0;3;ScenePickingPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=Picking;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0
-Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;2;832,-96;Float;False;True;-1;2;ASEMaterialInspector;0;15;Soullies/TrackShader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit;0;0;Sprite Unlit;4;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;2;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;True;True;1;False;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=Universal2D;False;False;0;Hidden/InternalErrorShader;0;0;Standard;3;Vertex Position;1;0;Debug Display;0;0;External Alpha;0;0;0;4;True;True;True;True;False;;False;0
+Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;2;704,-160;Float;False;True;-1;2;ASEMaterialInspector;0;17;Soullies/TrackShader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit;0;0;Sprite Unlit;4;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;2;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;True;True;1;False;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=Universal2D;False;False;0;Hidden/InternalErrorShader;0;0;Standard;3;Vertex Position;1;0;Debug Display;0;0;External Alpha;0;0;0;4;True;True;True;True;False;;False;0
 WireConnection;10;0;6;0
-WireConnection;18;0;12;0
-WireConnection;18;2;10;0
-WireConnection;18;3;10;3
+WireConnection;28;1;10;3
+WireConnection;28;0;10;0
 WireConnection;13;0;10;0
 WireConnection;13;1;10;1
 WireConnection;13;2;10;2
-WireConnection;13;3;18;0
+WireConnection;13;3;28;0
 WireConnection;14;0;13;0
 WireConnection;14;1;8;0
+WireConnection;29;1;30;0
+WireConnection;29;0;20;0
 WireConnection;21;0;14;0
-WireConnection;21;1;20;0
-WireConnection;16;0;17;0
-WireConnection;16;2;21;0
-WireConnection;16;3;14;0
-WireConnection;2;1;16;0
+WireConnection;21;1;29;0
+WireConnection;2;1;21;0
 ASEEND*/
-//CHKSM=23C607089893A356315F304BB06119DFAE587F85
+//CHKSM=40C28A86E8CC0AB370CE278DE6A8EB09B052B98B
--- a/Assets/Shaders/TrackShader.shader.meta
+++ b/Assets/Shaders/TrackShader.shader.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 423e4019c51e2433e94a8efed1980448
+guid: 44e8d6dab1446644688189717537509a
 ShaderImporter:
  externalObjects: {}
  defaultTextures: []
--- a/Assets/StreamingAssets/AutoSave/Terminal/AutoSave_0.json
+++ b/Assets/StreamingAssets/AutoSave/Terminal/AutoSave_0.json
@@ -0,0 +1,717 @@
+{
+	"BeatMap" : {
+		"__type" : "Ichni.RhythmGame.Beatmap.BeatmapContainer_BM,Assembly-CSharp",
+		"value" : {
+			"elementList" : [
+				{
+					"__type" : "Ichni.RhythmGame.Beatmap.ElementFolder_BM,Assembly-CSharp",
+					"elementName" : "New Folder",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "030b4b43-46bb-43c9-84e7-6a98207a39c9"
+					},
+					"attachedElementGuid" : {
+						"value" : "00000000-0000-0000-0000-000000000000"
+					}
+				},{
+					"__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" : "030b4b43-46bb-43c9-84e7-6a98207a39c9"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "030b4b43-46bb-43c9-84e7-6a98207a39c9"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Track_BM,Assembly-CSharp",
+					"elementName" : "New Track",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					},
+					"attachedElementGuid" : {
+						"value" : "030b4b43-46bb-43c9-84e7-6a98207a39c9"
+					}
+				},{
+					"__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" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TrackPathSubmodule_BM,Assembly-CSharp",
+					"trackSpaceType" : 0,
+					"trackSamplingType" : 0,
+					"isClosed" : false,
+					"isShowingDisplay" : false,
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TrackRendererSubmoduleAutoOrient_BM,Assembly-CSharp",
+					"materialThemeBundleName" : "departure_to_multiverse",
+					"materialName" : "EnergyTrail0",
+					"enableEmission" : true,
+					"emissionIntensity" : 0,
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TrackTimeSubmoduleMovable_BM,Assembly-CSharp",
+					"trackStartTime" : 0,
+					"trackEndTime" : 4,
+					"visibleTrackTimeLength" : 2,
+					"animationCurveType" : 0,
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.PathNode_BM,Assembly-CSharp",
+					"isShowingSphere" : false,
+					"elementName" : "New Path Node",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
+					"originalPosition" : {
+						"x" : 10,
+						"y" : 0,
+						"z" : 10
+					},
+					"originalEulerAngles" : {
+						"x" : 0,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalScale" : {
+						"x" : 1,
+						"y" : 1,
+						"z" : 1
+					},
+					"attachedElementGuid" : {
+						"value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp",
+					"originalBaseColor" : {
+						"r" : 1,
+						"g" : 1,
+						"b" : 0,
+						"a" : 1
+					},
+					"emissionEnabled" : false,
+					"originalEmissionColor" : {
+						"r" : 0,
+						"g" : 0,
+						"b" : 0,
+						"a" : 1
+					},
+					"originalEmissionIntensity" : 0,
+					"attachedElementGuid" : {
+						"value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.PathNode_BM,Assembly-CSharp",
+					"isShowingSphere" : false,
+					"elementName" : "New Path Node",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "42fc001e-dd4f-4480-ab39-5e739519c068"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
+					"originalPosition" : {
+						"x" : -10,
+						"y" : 0,
+						"z" : 10
+					},
+					"originalEulerAngles" : {
+						"x" : 0,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalScale" : {
+						"x" : 1,
+						"y" : 1,
+						"z" : 1
+					},
+					"attachedElementGuid" : {
+						"value" : "42fc001e-dd4f-4480-ab39-5e739519c068"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "42fc001e-dd4f-4480-ab39-5e739519c068"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp",
+					"originalBaseColor" : {
+						"r" : 0,
+						"g" : 1,
+						"b" : 1,
+						"a" : 1
+					},
+					"emissionEnabled" : false,
+					"originalEmissionColor" : {
+						"r" : 0,
+						"g" : 0,
+						"b" : 0,
+						"a" : 1
+					},
+					"originalEmissionIntensity" : 0,
+					"attachedElementGuid" : {
+						"value" : "42fc001e-dd4f-4480-ab39-5e739519c068"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp",
+					"exactJudgeTime" : 1,
+					"elementName" : "New Tap",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						{
+							"__type" : "Ichni.RhythmGame.Beatmap.TouchAreaJudgeUnit_BM,Assembly-CSharp",
+							"areaRadius" : 1000
+						}
+					],
+					"attachedElementGuid" : {
+						"value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Stay_BM,Assembly-CSharp",
+					"exactJudgeTime" : 3,
+					"elementName" : "New Stay",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						{
+							"__type" : "Ichni.RhythmGame.Beatmap.TouchAreaJudgeUnit_BM,Assembly-CSharp",
+							"areaRadius" : 1000
+						}
+					],
+					"attachedElementGuid" : {
+						"value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"themeBundleName" : "departure_to_multiverse",
+					"objectName" : "DTM_NoteVisualTap",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6"
+					},
+					"attachedElementGuid" : {
+						"value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002"
+					}
+				},{
+					"__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" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6"
+					}
+				},{
+					"__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" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp",
+					"effectCollection" : {"Generate":[
+							
+						],"GeneralJudge":[
+							
+						],"Holding":[
+							
+						],"Perfect":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNotePerfectBurst_BM,Assembly-CSharp",
+								"effectTime" : 0
+							},{
+								"__type" : "Ichni.RhythmGame.Beatmap.BloomEffect_BM,Assembly-CSharp",
+								"duration" : 0.5,
+								"peak" : 3,
+								"intensityCurve" : {
+									"keys" : [
+										{
+											"time" : 0,
+											"value" : 1,
+											"inTangent" : 0,
+											"outTangent" : 0
+										},{
+											"time" : 1,
+											"value" : 0,
+											"inTangent" : 0,
+											"outTangent" : 0
+										}
+									],
+									"preWrapMode" : 8,
+									"postWrapMode" : 8
+								},
+								"effectTime" : 0
+							}
+						],"Good":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteGoodBurst_BM,Assembly-CSharp",
+								"effectTime" : 0
+							}
+						],"Bad":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteBadBurst_BM,Assembly-CSharp",
+								"effectTime" : 0
+							}
+						],"Miss":[
+							
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"themeBundleName" : "departure_to_multiverse",
+					"objectName" : "DTM_NoteVisualStay",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "976c1bde-65be-468c-81d3-0c133f615edb"
+					},
+					"attachedElementGuid" : {
+						"value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9"
+					}
+				},{
+					"__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" : "976c1bde-65be-468c-81d3-0c133f615edb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -32767,
+					"endTime" : 32767,
+					"attachedElementGuid" : {
+						"value" : "976c1bde-65be-468c-81d3-0c133f615edb"
+					}
+				},{
+					"__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" : "976c1bde-65be-468c-81d3-0c133f615edb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp",
+					"effectCollection" : {"Generate":[
+							
+						],"GeneralJudge":[
+							
+						],"Holding":[
+							
+						],"Perfect":[
+							{
+								"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNotePerfectBurst_BM,Assembly-CSharp",
+								"effectTime" : 0
+							}
+						],"Good":[
+							
+						],"Bad":[
+							
+						],"Miss":[
+							
+						]
+					},
+					"attachedElementGuid" : {
+						"value" : "976c1bde-65be-468c-81d3-0c133f615edb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Hold_BM,Assembly-CSharp",
+					"holdEndTime" : 2.5,
+					"exactJudgeTime" : 1.5,
+					"elementName" : "New Hold",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -1,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp",
+					"judgeUnitList" : [
+						
+					],
+					"attachedElementGuid" : {
+						"value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicHoldVisualMovable_BM,Assembly-CSharp",
+					"themeBundleName" : "basic",
+					"objectName" : "BasicNoteHoldMovable",
+					"elementName" : "New Note Visual",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "160d94d5-652f-4402-b0e3-a7451b554307"
+					},
+					"attachedElementGuid" : {
+						"value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9"
+					}
+				},{
+					"__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" : "160d94d5-652f-4402-b0e3-a7451b554307"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -1,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "160d94d5-652f-4402-b0e3-a7451b554307"
+					}
+				},{
+					"__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" : "160d94d5-652f-4402-b0e3-a7451b554307"
+					}
+				},{
+					"__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" : 1
+							}
+						],"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" : "160d94d5-652f-4402-b0e3-a7451b554307"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TrackPercentPoint_BM,Assembly-CSharp",
+					"trackPercent" : {
+						"animatedFloatList" : [
+							{
+								"startValue" : 0,
+								"endValue" : 1,
+								"startTime" : 0,
+								"endTime" : 4,
+								"animationCurveType" : 0
+							}
+						]
+					},
+					"elementName" : "New Track Percent Point",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "e4f33324-1df1-44f7-b730-21357edfcda4"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -1,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "e4f33324-1df1-44f7-b730-21357edfcda4"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Trail_BM,Assembly-CSharp",
+					"visibleTimeLength" : 2,
+					"renderMaterialName" : "DefaultTrailMaterial",
+					"isAutoOrient" : true,
+					"widthMultiplier" : 1,
+					"widthCurve" : {
+						"keys" : [
+							{
+								"time" : 0,
+								"value" : 1,
+								"inTangent" : 0,
+								"outTangent" : 0
+							},{
+								"time" : 1,
+								"value" : 1,
+								"inTangent" : 0,
+								"outTangent" : 0
+							}
+						],
+						"preWrapMode" : 8,
+						"postWrapMode" : 8
+					},
+					"elementName" : "New Trail",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "7e68e165-d078-442e-a68a-c2d4f10827a9"
+					},
+					"attachedElementGuid" : {
+						"value" : "e4f33324-1df1-44f7-b730-21357edfcda4"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
+					"originalPosition" : {
+						"x" : 0,
+						"y" : -2,
+						"z" : 0
+					},
+					"originalEulerAngles" : {
+						"x" : 0,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalScale" : {
+						"x" : 1,
+						"y" : 1,
+						"z" : 1
+					},
+					"attachedElementGuid" : {
+						"value" : "7e68e165-d078-442e-a68a-c2d4f10827a9"
+					}
+				}
+			],
+			"attachedElementGuid" : {
+				"value" : "00000000-0000-0000-0000-000000000000"
+			}
+		}
+	}
+}
--- a/Assets/StreamingAssets/Projects/Terminal/Beatmap.json
+++ b/Assets/StreamingAssets/Projects/Terminal/Beatmap.json
@@ -97,7 +97,7 @@
 					"materialThemeBundleName" : "departure_to_multiverse",
 					"materialName" : "EnergyTrail0",
 					"enableEmission" : true,
-					"emissionIntensity" : 4,
+					"emissionIntensity" : 0,
 					"attachedElementGuid" : {
 						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
 					}
@@ -523,9 +523,9 @@
 						"value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9"
 					}
 				},{
-					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicHoldVisual_BM,Assembly-CSharp",
+					"__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicHoldVisualMovable_BM,Assembly-CSharp",
 					"themeBundleName" : "basic",
-					"objectName" : "BasicNoteHold",
+					"objectName" : "BasicNoteHoldMovable",
 					"elementName" : "New Note Visual",
 					"tags" : [
 						
@@ -623,6 +623,90 @@
 					"attachedElementGuid" : {
 						"value" : "160d94d5-652f-4402-b0e3-a7451b554307"
 					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TrackPercentPoint_BM,Assembly-CSharp",
+					"trackPercent" : {
+						"animatedFloatList" : [
+							{
+								"startValue" : 0,
+								"endValue" : 1,
+								"startTime" : 0,
+								"endTime" : 4,
+								"animationCurveType" : 0
+							}
+						]
+					},
+					"elementName" : "New Track Percent Point",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "e4f33324-1df1-44f7-b730-21357edfcda4"
+					},
+					"attachedElementGuid" : {
+						"value" : "d9d3df55-9509-46dc-8e2f-d628993313cb"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp",
+					"isOverridingDuration" : false,
+					"startTime" : -1,
+					"endTime" : 0,
+					"attachedElementGuid" : {
+						"value" : "e4f33324-1df1-44f7-b730-21357edfcda4"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.Trail_BM,Assembly-CSharp",
+					"visibleTimeLength" : 2,
+					"renderMaterialName" : "DefaultTrailMaterial",
+					"isAutoOrient" : true,
+					"widthMultiplier" : 1,
+					"widthCurve" : {
+						"keys" : [
+							{
+								"time" : 0,
+								"value" : 1,
+								"inTangent" : 0,
+								"outTangent" : 0
+							},{
+								"time" : 1,
+								"value" : 1,
+								"inTangent" : 0,
+								"outTangent" : 0
+							}
+						],
+						"preWrapMode" : 8,
+						"postWrapMode" : 8
+					},
+					"elementName" : "New Trail",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "7e68e165-d078-442e-a68a-c2d4f10827a9"
+					},
+					"attachedElementGuid" : {
+						"value" : "e4f33324-1df1-44f7-b730-21357edfcda4"
+					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp",
+					"originalPosition" : {
+						"x" : 0,
+						"y" : -2,
+						"z" : 0
+					},
+					"originalEulerAngles" : {
+						"x" : 0,
+						"y" : 0,
+						"z" : 0
+					},
+					"originalScale" : {
+						"x" : 1,
+						"y" : 1,
+						"z" : 1
+					},
+					"attachedElementGuid" : {
+						"value" : "7e68e165-d078-442e-a68a-c2d4f10827a9"
+					}
 				}
 			],
 			"attachedElementGuid" : {
--- a/Assets/StreamingAssets/ThemeBundles/OSX/OSX
+++ b/Assets/StreamingAssets/ThemeBundles/OSX/OSX
--- a/Assets/StreamingAssets/ThemeBundles/OSX/OSX.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/OSX/OSX.manifest
@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 2326133601
+CRC: 3393409780
 AssetBundleManifest:
  AssetBundleInfos:
    Info_0:
--- a/Assets/StreamingAssets/ThemeBundles/OSX/basic
+++ b/Assets/StreamingAssets/ThemeBundles/OSX/basic
--- a/Assets/StreamingAssets/ThemeBundles/OSX/basic.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/OSX/basic.manifest
@@ -1,15 +1,15 @@
 ManifestFileVersion: 0
-CRC: 1307421485
+CRC: 2839714745
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: 1915ed5d0b6e0ca23eb1ec1e0033bbac
+    Hash: e97f9ef7be70f049f85b3caa0f210dda
  TypeTreeHash:
    serializedVersion: 2
-    Hash: 8c861b0fd2b539f00421fd97e0447b27
+    Hash: ba4dbc034cf972e8bde9558b656c4876
  IncrementalBuildHash:
    serializedVersion: 2
-    Hash: 1915ed5d0b6e0ca23eb1ec1e0033bbac
+    Hash: e97f9ef7be70f049f85b3caa0f210dda
 HashAppended: 0
 ClassTypes:
 - Class: 1
@@ -42,6 +42,8 @@ ClassTypes:
  Script: {fileID: 11500000, guid: 72caf325f2b59403c94193cd2037b7ba, type: 3}
 - Class: 114
  Script: {fileID: 11500000, guid: f92b9b8f89de544adaa001ccfdf7eae4, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: cba1fe17342b14361bb504a9a506878b, type: 3}
 - Class: 115
  Script: {instanceID: 0}
 - Class: 212
@@ -53,6 +55,7 @@ SerializeReferenceClassIdentifiers:
  ClassName: Sirenix.Serialization.SerializationData
 Assets:
 - Assets/ThemeBundles/Basic/Prefabs/Plane.prefab
+- Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab
 - Assets/ThemeBundles/Basic/Prefabs/Square2D.prefab
 - Assets/ThemeBundles/Basic/Prefabs/Cube.prefab
 - Assets/ThemeBundles/Basic/Prefabs/Cylinder.prefab
@@ -66,7 +69,7 @@ Assets:
 - Assets/ThemeBundles/Basic/Prefabs/Sphere.prefab
 - Assets/ThemeBundles/Basic/Prefabs/Quad.prefab
 - Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab
- Assets/ThemeBundles/Basic/Prefabs/BasicNoteHold.prefab
+- Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab
 - Assets/ThemeBundles/Basic/Prefabs/DirectionalLight.prefab
 - Assets/ThemeBundles/Basic/Prefabs/PointLight.prefab
 Dependencies: []
--- a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab
+++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab
@@ -0,0 +1,255 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6759562726529963496
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8577101396104971865}
+  - component: {fileID: 1652441339443578052}
+  m_Layer: 0
+  m_Name: JudgeEffect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8577101396104971865
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6759562726529963496}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 4303129164719886000}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1652441339443578052
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6759562726529963496}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 0ab11be59df835d4099df401d7420c44, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 1
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &7418166426351319151
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2236104322558172231}
+  - component: {fileID: 4662184346438900431}
+  - component: {fileID: 7556478762474901918}
+  m_Layer: 0
+  m_Name: NoteMain
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2236104322558172231
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7418166426351319151}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4303129164719886000}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4662184346438900431
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7418166426351319151}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7556478762474901918
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7418166426351319151}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: b39306d2c39754d0aafabe8570b8e640, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &8969796646526822168
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4303129164719886000}
+  - component: {fileID: 1274404912192895846}
+  m_Layer: 0
+  m_Name: BasicNoteHoldMovable
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4303129164719886000
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8969796646526822168}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2236104322558172231}
+  - {fileID: 8577101396104971865}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1274404912192895846
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8969796646526822168}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cba1fe17342b14361bb504a9a506878b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  serializationData:
+    SerializedFormat: 2
+    SerializedBytes: 
+    ReferencedUnityObjects: []
+    SerializedBytesString: 
+    Prefab: {fileID: 0}
+    PrefabModificationsReferencedUnityObjects: []
+    PrefabModifications: []
+    SerializationNodes:
+    - Name: elementGuid
+      Entry: 2
+      Data: 00000000000000000000000000000000
+    - Name: submoduleList
+      Entry: 7
+      Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase,
+        Assembly-CSharp]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+  elementName: 
+  tags: []
+  parentElement: {fileID: 0}
+  connectedTab: {fileID: 0}
+  childElementList: []
+  themeBundleName: 
+  objectName: 
+  note: {fileID: 0}
+  noteMain: {fileID: 7418166426351319151}
+  judgeEffect: {fileID: 6759562726529963496}
+  notePartList:
+  - {fileID: 7418166426351319151}
+  effectPartList:
+  - {fileID: 6759562726529963496}
+  hold: {fileID: 0}
--- a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab.meta
+++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e8618d7bd895943258b55c798f5b3da6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: basic
+  assetBundleVariant: 
--- a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab
+++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab
@@ -178,7 +178,7 @@ GameObject:
  - component: {fileID: 4303129164719886000}
  - component: {fileID: 7543664491821477037}
  m_Layer: 0
-  m_Name: BasicNoteHold
+  m_Name: BasicNoteHoldStatic
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -243,8 +243,8 @@ MonoBehaviour:
  parentElement: {fileID: 0}
  connectedTab: {fileID: 0}
  childElementList: []
-  themeBundleName: basic
-  objectName: BasicNoteHold
+  themeBundleName: 
+  objectName: 
  note: {fileID: 0}
  noteMain: {fileID: 7418166426351319151}
  judgeEffect: {fileID: 6759562726529963496}
@@ -252,3 +252,4 @@ MonoBehaviour:
  - {fileID: 7418166426351319151}
  effectPartList:
  - {fileID: 6759562726529963496}
+  hold: {fileID: 0}
--- a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab.meta
+++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab.meta
--- a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab
+++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab
@@ -225,79 +225,10 @@ MonoBehaviour:
    - Name: elementGuid
      Entry: 2
      Data: 00000000000000000000000000000000
-    - Name: timeDurationSubmodule
+    - Name: submoduleList
      Entry: 7
-      Data: 0|Ichni.RhythmGame.TimeDurationSubmodule, Assembly-CSharp
-    - Name: attachedElement
-      Entry: 6
-      Data: 
-    - Name: isOverridingDuration
-      Entry: 5
-      Data: false
-    - Name: startTime
-      Entry: 4
-      Data: 0
-    - Name: endTime
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: transformSubmodule
-      Entry: 7
-      Data: 1|Ichni.RhythmGame.TransformSubmodule, Assembly-CSharp
-    - Name: attachedElement
-      Entry: 6
-      Data: 
-    - Name: originalPosition
-      Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: originalEulerAngles
-      Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: originalScale
-      Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 1
-    - Name: 
-      Entry: 4
-      Data: 1
-    - Name: 
-      Entry: 4
-      Data: 1
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: positionOffset
-      Entry: 7
-      Data: 2|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]],
-        mscorlib
+      Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase,
+        Assembly-CSharp]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -307,242 +238,13 @@ MonoBehaviour:
    - Name: 
      Entry: 8
      Data: 
-    - Name: eulerAnglesOffset
-      Entry: 7
-      Data: 3|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]],
-        mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: scaleOffset
-      Entry: 7
-      Data: 4|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]],
-        mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: currentPosition
-      Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: currentEulerAngles
-      Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: currentScale
-      Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 1
-    - Name: 
-      Entry: 4
-      Data: 1
-    - Name: 
-      Entry: 4
-      Data: 1
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: positionDirtyMark
-      Entry: 5
-      Data: false
-    - Name: eulerAnglesDirtyMark
-      Entry: 5
-      Data: false
-    - Name: scaleDirtyMark
-      Entry: 5
-      Data: false
-    - Name: eulerAnglesOffsetLock
-      Entry: 5
-      Data: false
-    - Name: OnPositionChanged
-      Entry: 6
-      Data: 
-    - Name: OnEulerAnglesChanged
-      Entry: 6
-      Data: 
-    - Name: OnScaleChanged
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: colorSubmodule
-      Entry: 7
-      Data: 5|Ichni.RhythmGame.ColorSubmodule, Assembly-CSharp
-    - Name: attachedElement
-      Entry: 6
-      Data: 
-    - Name: originalBaseColor
-      Entry: 7
-      Data: UnityEngine.Color, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: emissionEnabled
-      Entry: 5
-      Data: false
-    - Name: originalEmissionColor
-      Entry: 7
-      Data: UnityEngine.Color, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: originalEmissionIntensity
-      Entry: 4
-      Data: 0
-    - Name: baseColorOffset
-      Entry: 7
-      Data: 6|System.Collections.Generic.List`1[[UnityEngine.Color, UnityEngine.CoreModule]],
-        mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: emissionColorOffset
-      Entry: 7
-      Data: 7|System.Collections.Generic.List`1[[UnityEngine.Color, UnityEngine.CoreModule]],
-        mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: emissionIntensityOffset
-      Entry: 7
-      Data: 8|System.Collections.Generic.List`1[[System.Single, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: currentBaseColor
-      Entry: 7
-      Data: UnityEngine.Color, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: currentEmissionColor
-      Entry: 7
-      Data: UnityEngine.Color, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 4
-      Data: 0
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: currentEmissionIntensity
-      Entry: 4
-      Data: 0
-    - Name: baseColorDirtyMark
-      Entry: 5
-      Data: false
-    - Name: emissionColorDirtyMark
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
  elementName: 
-  serialNumber: 0
  tags: []
  parentElement: {fileID: 0}
+  connectedTab: {fileID: 0}
  childElementList: []
-  themeBundleName: basic
-  objectName: BasicNoteTap3D
+  themeBundleName: 
+  objectName: 
  note: {fileID: 0}
  noteMain: {fileID: 7418166426351319151}
  judgeEffect: {fileID: 6759562726529963496}
--- a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs
+++ b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Ichni.RhythmGame.Beatmap;
+using UnityEngine;
+
+namespace Ichni.RhythmGame.ThemeBundles.Basic
+{
+    public partial class BasicHoldVisualMovable : NoteVisualBaseHold
+    {
+        public static BasicHoldVisualMovable GenerateElement(string elementName, Guid id, List<string> tags,
+            bool isFirstGenerated,  GameElement parentElement, string themeBundleName, string objectName)
+        {
+            BasicHoldVisualMovable holdVisualMovable = SubstantialObject.GenerateElement(elementName, id, tags, 
+                isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent<BasicHoldVisualMovable>();
+            
+            return holdVisualMovable;
+        }
+        
+        public override void FirstSetUpObject(bool isFirstGenerated)
+        {
+            NoteBase note = parentElement as NoteBase;
+            if(note == null) throw new System.Exception("NoteVisual只能生成在Note下。");
+            this.note = note;
+            note.noteVisual = this;
+            this.hold = note as Hold;
+
+            if (isFirstGenerated)
+            {
+                effectSubmodule.effectCollection["Generate"].Add(new BasicNoteGenerateExpand(this));
+                effectSubmodule.effectCollection["Holding"].Add(new BasicNoteHoldingExpand(this));
+                effectSubmodule.effectCollection["Perfect"].Add(new BasicNotePerfectBurst(this));
+                effectSubmodule.effectCollection["Good"].Add(new BasicNoteGoodBurst(this));
+                effectSubmodule.effectCollection["Bad"].Add(new BasicNoteBadShrink(this));
+                effectSubmodule.effectCollection["Miss"].Add(new BasicNoteMissPale(this));
+            }
+        }
+    }
+    
+    public partial class BasicHoldVisualMovable
+    {
+        public override void SaveBM()
+        {
+            matchedBM = new Beatmap.BasicHoldVisualMovable_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName);
+        }
+
+        public override void UpdateHoldInMovableTrack()
+        {
+            if (hold.isHolding)
+            {
+                float percent = (hold.track.trackTimeSubmodule as TrackTimeSubmoduleMovable).GetTrackPercent(hold.exactJudgeTime + hold.holdingTime);
+                hold.trackPositioner.SetPercent(percent);
+            }
+        }
+    }
+    
+    namespace Beatmap
+    {
+        public class BasicHoldVisualMovable_BM : SubstantialObject_BM
+        {
+            public BasicHoldVisualMovable_BM()
+            {
+                
+            }
+
+            public BasicHoldVisualMovable_BM(string elementName, Guid id, List<string> tags, 
+                GameElement_BM parent, string themeBundleName, string objectName) :
+                base(elementName, id, tags, parent, themeBundleName, objectName)
+            {
+               
+            }
+
+            public override void ExecuteBM()
+            {
+                matchedElement = BasicHoldVisualMovable.GenerateElement(elementName, elementGuid, tags, false, 
+                    GetElement(attachedElementGuid), themeBundleName, objectName);
+            }
+            
+            public override GameElement DuplicateBM(GameElement parent)
+            {
+                return BasicHoldVisualMovable.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName);
+            }
+        }
+    }
+}
--- a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs.meta
+++ b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cba1fe17342b14361bb504a9a506878b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs
+++ b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs
@@ -6,15 +6,15 @@ using UnityEngine;

 namespace Ichni.RhythmGame.ThemeBundles.Basic
 {
-    public partial class BasicHoldVisual : NoteVisualBaseHold
+    public partial class BasicHoldVisualStatic : NoteVisualBaseHold
    {
-        public static BasicHoldVisual GenerateElement(string elementName, Guid id, List<string> tags,
+        public static BasicHoldVisualStatic GenerateElement(string elementName, Guid id, List<string> tags,
            bool isFirstGenerated,  GameElement parentElement, string themeBundleName, string objectName)
        {
-            BasicHoldVisual holdVisual = SubstantialObject.GenerateElement(elementName, id, tags, 
-                isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent<BasicHoldVisual>();
+            BasicHoldVisualStatic holdVisualStatic = SubstantialObject.GenerateElement(elementName, id, tags, 
+                isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent<BasicHoldVisualStatic>();
            
-            return holdVisual;
+            return holdVisualStatic;
        }
        
        public override void FirstSetUpObject(bool isFirstGenerated)
@@ -23,6 +23,7 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
            if(note == null) throw new System.Exception("NoteVisual只能生成在Note下。");
            this.note = note;
            note.noteVisual = this;
+            this.hold = note as Hold;

            if (isFirstGenerated)
            {
@@ -36,24 +37,24 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
        }
    }
    
-    public partial class BasicHoldVisual
+    public partial class BasicHoldVisualStatic
    {
        public override void SaveBM()
        {
-            matchedBM = new Beatmap.BasicHoldVisual_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName);
+            matchedBM = new Beatmap.BasicHoldVisualStatic_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName);
        }
    }

    namespace Beatmap
    {
-        public class BasicHoldVisual_BM : SubstantialObject_BM
+        public class BasicHoldVisualStatic_BM : SubstantialObject_BM
        {
-            public BasicHoldVisual_BM()
+            public BasicHoldVisualStatic_BM()
            {
                
            }

-            public BasicHoldVisual_BM(string elementName, Guid id, List<string> tags, 
+            public BasicHoldVisualStatic_BM(string elementName, Guid id, List<string> tags, 
                GameElement_BM parent, string themeBundleName, string objectName) :
                base(elementName, id, tags, parent, themeBundleName, objectName)
            {
@@ -62,13 +63,13 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic

            public override void ExecuteBM()
            {
-                matchedElement = BasicHoldVisual.GenerateElement(elementName, elementGuid, tags, false, 
+                matchedElement = BasicHoldVisualStatic.GenerateElement(elementName, elementGuid, tags, false, 
                    GetElement(attachedElementGuid), themeBundleName, objectName);
            }
            
            public override GameElement DuplicateBM(GameElement parent)
            {
-                return BasicHoldVisual.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName);
+                return BasicHoldVisualStatic.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName);
            }
        }
    }
--- a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs.meta
+++ b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs.meta
--- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/EnergyTrail0.mat
+++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/EnergyTrail0.mat
@@ -8,16 +8,17 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: EnergyTrail0
-  m_Shader: {fileID: -6465566751694194690, guid: ee7160752d2114149904ca2b2b012bbf,
-    type: 3}
+  m_Shader: {fileID: 4800000, guid: 44e8d6dab1446644688189717537509a, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION_ON
+  - _USEREDASALPHA_ON
  m_InvalidKeywords:
  - _ALPHAPREMULTIPLY_ON
  - _FLIPBOOKBLENDING_OFF
  - _RECEIVE_SHADOWS_OFF
-  m_LightmapFlags: 0
+  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 1
  m_CustomRenderQueue: -1
@@ -59,6 +60,10 @@ Material:
        m_Texture: {fileID: 2800000, guid: fe0f51232d3c144e98a40dcef497dca2, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _MainTexture:
+        m_Texture: {fileID: 2800000, guid: fe0f51232d3c144e98a40dcef497dca2, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _MaskTex:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@@ -83,6 +88,10 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@@ -98,6 +107,7 @@ Material:
    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
+    - _AlphaCutoff: 0.5
    - _AlphaToMask: 0
    - _Blend: 0
    - _BlendModePreserveSpecular: 1
@@ -119,7 +129,7 @@ Material:
    - _DistortionStrengthScaled: 0
    - _DstBlend: 10
    - _DstBlendAlpha: 0
-    - _Emission: 0
+    - _Emission: 1
    - _EmissionEnabled: 0
    - _EnableExternalAlpha: 0
    - _EnvironmentReflections: 1
@@ -157,7 +167,7 @@ Material:
    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 2, g: 2, b: 2, a: 1}
    - _Flip: {r: 1, g: 1, b: 1, a: 1}
    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}