diff --git a/Assets/Resources/Sprites/Editor/UI/bookmark.png b/Assets/Resources/Sprites/Editor/UI/bookmark.png new file mode 100644 index 000000000..b47bf1a31 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/UI/bookmark.png differ diff --git a/Assets/Resources/Sprites/Editor/UI/bookmark.png.meta b/Assets/Resources/Sprites/Editor/UI/bookmark.png.meta new file mode 100644 index 000000000..a62e5b4fa --- /dev/null +++ b/Assets/Resources/Sprites/Editor/UI/bookmark.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: e85d5d286a8191b499c570d33dd0899c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/UI/document-signed.png b/Assets/Resources/Sprites/Editor/UI/document-signed.png new file mode 100644 index 000000000..2c1dc99d7 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/UI/document-signed.png differ diff --git a/Assets/Resources/Sprites/Editor/UI/document-signed.png.meta b/Assets/Resources/Sprites/Editor/UI/document-signed.png.meta new file mode 100644 index 000000000..5cd24b6f2 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/UI/document-signed.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: dd516f1a3380ca642939d4fa86603249 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 24bd31474..bd4978bf7 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -2485,6 +2485,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81650874} m_CullTransparentMesh: 1 +--- !u!1 &84804249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 84804250} + - component: {fileID: 84804252} + - component: {fileID: 84804251} + m_Layer: 8 + m_Name: Graphic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &84804250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84804249} + 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_Children: [] + m_Father: {fileID: 2125404436} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 33, y: 33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &84804251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84804249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e85d5d286a8191b499c570d33dd0899c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &84804252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84804249} + m_CullTransparentMesh: 1 --- !u!1 &86022610 GameObject: m_ObjectHideFlags: 0 @@ -4540,6 +4615,7 @@ RectTransform: - {fileID: 270008765} - {fileID: 456434810} - {fileID: 689781277} + - {fileID: 2125404436} m_Father: {fileID: 1050802356} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17271,14 +17347,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05e0181d5d7f7144f9263d1ccca41112, type: 3} + m_Sprite: {fileID: 21300000, guid: dd516f1a3380ca642939d4fa86603249, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23226,8 +23302,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 - m_Size: 0.99854255 + m_Value: 1 + m_Size: 0.9924746 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -29574,7 +29650,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 45, y: -60.004883} - m_SizeDelta: {x: 320, y: 35} + m_SizeDelta: {x: 490, y: 35} m_Pivot: {x: 0, y: 0} --- !u!114 &1149103346 MonoBehaviour: @@ -29596,7 +29672,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Event + m_text: AWWWWWWW BWWWWWWW CWWWWWWW m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} @@ -29623,12 +29699,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 21.7 m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -29641,7 +29717,7 @@ MonoBehaviour: m_charWidthMaxAdj: 0 m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 - m_overflowMode: 0 + m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 @@ -30049,7 +30125,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 129.9111} + m_AnchoredPosition: {x: 0, y: 129.83882} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -45860,7 +45936,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -84.99005} + m_AnchoredPosition: {x: 0, y: -84.99002} m_SizeDelta: {x: 320, y: -113.92} m_Pivot: {x: 0, y: 1} --- !u!1 &1852819572 @@ -45989,6 +46065,7 @@ MonoBehaviour: SelectionsBTN: {fileID: 270008766} TempoChangeBTN: {fileID: 456434811} MusicVolumeBTN: {fileID: 689781278} + ChartSectionBTN: {fileID: 2125404437} PlaybackSpeed: {fileID: 1992194284} LayerCorners: - {x: 0, y: 0, z: 0} @@ -52530,6 +52607,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2122610457} m_CullTransparentMesh: 1 +--- !u!1 &2125404435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2125404436} + - component: {fileID: 2125404439} + - component: {fileID: 2125404438} + - component: {fileID: 2125404437} + m_Layer: 8 + m_Name: Chart Sections + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2125404436 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125404435} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_Children: + - {fileID: 84804250} + m_Father: {fileID: 156962254} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 140, y: 0.111961365} + m_SizeDelta: {x: 39.99997, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &2125404437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125404435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.7490196, g: 1, b: 1, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2125404438} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2125404438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125404435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 10 +--- !u!222 &2125404439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125404435} + m_CullTransparentMesh: 1 --- !u!1 &2127582756 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs index de7dc326d..e2b0265ef 100644 --- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs @@ -34,18 +34,54 @@ namespace HeavenStudio.Editor.Track public class CurrentTimelineState { - public bool selected; - public bool tempoChange; - public bool musicVolume; + public enum State + { + Selection, + TempoChange, + MusicVolume, + ChartSection + } + + State currentState = State.Selection; + + public bool selected { get { return currentState == State.Selection; } } + public bool tempoChange { get { return currentState == State.TempoChange; } } + public bool musicVolume { get { return currentState == State.MusicVolume; } } + public bool chartSection { get { return currentState == State.ChartSection; } } public void SetState(bool selected, bool tempoChange, bool musicVolume) { if (Conductor.instance.NotStopped()) return; - this.selected = selected; - this.tempoChange = tempoChange; - this.musicVolume = musicVolume; + if (selected) + { + currentState = State.Selection; + instance.SelectionsBTN.transform.GetChild(0).GetComponent().color = Color.white; + } + else + instance.SelectionsBTN.transform.GetChild(0).GetComponent().color = Color.gray; + if (tempoChange) + { + currentState = State.TempoChange; + instance.TempoChangeBTN.transform.GetChild(0).GetComponent().color = Color.white; + } + else + instance.TempoChangeBTN.transform.GetChild(0).GetComponent().color = Color.gray; + if (musicVolume) + { + currentState = State.MusicVolume; + instance.MusicVolumeBTN.transform.GetChild(0).GetComponent().color = Color.white; + } + else + instance.MusicVolumeBTN.transform.GetChild(0).GetComponent().color = Color.gray; + } + + public void SetState(State state) + { + if (Conductor.instance.NotStopped()) return; + + currentState = state; if (selected) instance.SelectionsBTN.transform.GetChild(0).GetComponent().color = Color.white; else @@ -58,7 +94,10 @@ namespace HeavenStudio.Editor.Track instance.MusicVolumeBTN.transform.GetChild(0).GetComponent().color = Color.white; else instance.MusicVolumeBTN.transform.GetChild(0).GetComponent().color = Color.gray; - + if (chartSection) + instance.ChartSectionBTN.transform.GetChild(0).GetComponent().color = Color.white; + else + instance.ChartSectionBTN.transform.GetChild(0).GetComponent().color = Color.gray; } } @@ -84,6 +123,7 @@ namespace HeavenStudio.Editor.Track public Button SelectionsBTN; public Button TempoChangeBTN; public Button MusicVolumeBTN; + public Button ChartSectionBTN; public Slider PlaybackSpeed; public Vector3[] LayerCorners = new Vector3[4]; @@ -170,15 +210,19 @@ namespace HeavenStudio.Editor.Track SelectionsBTN.onClick.AddListener(delegate { - timelineState.SetState(true, false, false); + timelineState.SetState(CurrentTimelineState.State.Selection); }); TempoChangeBTN.onClick.AddListener(delegate { - timelineState.SetState(false, true, false); + timelineState.SetState(CurrentTimelineState.State.TempoChange); }); MusicVolumeBTN.onClick.AddListener(delegate { - timelineState.SetState(false, false, true); + timelineState.SetState(CurrentTimelineState.State.MusicVolume); + }); + ChartSectionBTN.onClick.AddListener(delegate + { + timelineState.SetState(CurrentTimelineState.State.ChartSection); }); Tooltip.AddTooltip(SongBeat.gameObject, "Current Beat"); @@ -195,13 +239,14 @@ namespace HeavenStudio.Editor.Track Tooltip.AddTooltip(SelectionsBTN.gameObject, "Tool: Selection [1]"); Tooltip.AddTooltip(TempoChangeBTN.gameObject, "Tool: Tempo Change [2]"); Tooltip.AddTooltip(MusicVolumeBTN.gameObject, "Tool: Music Volume [3]"); + Tooltip.AddTooltip(ChartSectionBTN.gameObject, "Tool: Beatmap Sections [4]"); Tooltip.AddTooltip(PlaybackSpeed.gameObject, "The preview's playback speed. Right click to reset to 1.0"); SetTimeButtonColors(true, false, false); MetronomeBTN.transform.GetChild(0).GetComponent().color = Color.gray; - timelineState.SetState(true, false, false); + timelineState.SetState(CurrentTimelineState.State.Selection); AutoBtnUpdate(); } @@ -300,15 +345,19 @@ namespace HeavenStudio.Editor.Track if (Input.GetKeyDown(KeyCode.Alpha1)) { - timelineState.SetState(true, false, false); + timelineState.SetState(CurrentTimelineState.State.Selection); } else if (Input.GetKeyDown(KeyCode.Alpha2)) { - timelineState.SetState(false, true, false); + timelineState.SetState(CurrentTimelineState.State.TempoChange); } else if (Input.GetKeyDown(KeyCode.Alpha3)) { - timelineState.SetState(false, false, true); + timelineState.SetState(CurrentTimelineState.State.MusicVolume); + } + else if (Input.GetKeyDown(KeyCode.Alpha4)) + { + timelineState.SetState(CurrentTimelineState.State.ChartSection); }