From e4cc930b7ee41e19432500e29b665a27f2c3f6aa Mon Sep 17 00:00:00 2001 From: Braedon Date: Sat, 29 Jan 2022 16:59:20 -0500 Subject: [PATCH] Keyboard shortcuts for timeline state --- Assets/Resources/Sprites/Editor/UI/cog.png | Bin 0 -> 11537 bytes .../Resources/Sprites/Editor/UI/cog.png.meta | 96 ++ Assets/Scenes/Editor.unity | 1017 +++++++++++++---- Assets/Scripts/Games/SpaceSoccer/Kicker.cs | 1 - Assets/Scripts/GlobalGameManager.cs | 4 +- Assets/Scripts/LevelEditor/Editor.cs | 4 + .../Scripts/LevelEditor/Timeline/Timeline.cs | 13 + 7 files changed, 927 insertions(+), 208 deletions(-) create mode 100644 Assets/Resources/Sprites/Editor/UI/cog.png create mode 100644 Assets/Resources/Sprites/Editor/UI/cog.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/cog.png b/Assets/Resources/Sprites/Editor/UI/cog.png new file mode 100644 index 0000000000000000000000000000000000000000..f7031a09a456f2746aed26ecc6f2e239a6e90e13 GIT binary patch literal 11537 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 WM{yBM4|Z-YEi21w$W_Uhhx`wTTOI@e literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sprites/Editor/UI/cog.png.meta b/Assets/Resources/Sprites/Editor/UI/cog.png.meta new file mode 100644 index 000000000..af00b662c --- /dev/null +++ b/Assets/Resources/Sprites/Editor/UI/cog.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 49e59e302f4a24a4da56bd63185fcb01 +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: 2048 + 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 732399aa0..1faef274c 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -123,6 +123,127 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &3236230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3236231} + - component: {fileID: 3236234} + - component: {fileID: 3236233} + - component: {fileID: 3236232} + m_Layer: 5 + m_Name: Settings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3236231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236230} + 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: 1090919178} + m_Father: {fileID: 202724642} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -2.6999512, y: -0.000030517578} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &3236232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236230} + 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: 3236233} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3236233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236230} + 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: 21300000, guid: 77703dfffd29ca6439338d6adfc62c9b, type: 3} + 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 &3236234 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236230} + m_CullTransparentMesh: 1 --- !u!1 &9435780 GameObject: m_ObjectHideFlags: 0 @@ -408,6 +529,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 93132552} m_CullTransparentMesh: 1 +--- !u!1 &112206233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 112206234} + - component: {fileID: 112206236} + - component: {fileID: 112206235} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &112206234 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112206233} + 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: 2051557111} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &112206235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112206233} + 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, g: 0, b: 0, a: 0.6156863} + 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: 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 &112206236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112206233} + m_CullTransparentMesh: 1 --- !u!1 &117889362 GameObject: m_ObjectHideFlags: 0 @@ -1492,7 +1688,8 @@ RectTransform: - {fileID: 1747099762} - {fileID: 2131880461} - {fileID: 1271528577} - - {fileID: 903653565} + - {fileID: 1055877578} + - {fileID: 3236231} m_Father: {fileID: 1791483803} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2363,6 +2560,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 321288859} m_CullTransparentMesh: 1 +--- !u!1 &343854782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 343854783} + - component: {fileID: 343854785} + - component: {fileID: 343854784} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &343854783 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343854782} + 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: 2051557111} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &343854784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343854782} + 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: 21300000, guid: f9232c079e126cd48a7344b23eaf42a5, type: 3} + 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: 0.5 +--- !u!222 &343854785 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343854782} + m_CullTransparentMesh: 1 --- !u!1 &355353077 GameObject: m_ObjectHideFlags: 0 @@ -5609,6 +5881,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820032004} m_CullTransparentMesh: 1 +--- !u!1 &830672828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 830672829} + - component: {fileID: 830672831} + - component: {fileID: 830672830} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &830672829 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 830672828} + 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: 1946344931} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &830672830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 830672828} + 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, g: 0, b: 0, a: 0.3529412} + 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: 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 &830672831 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 830672828} + m_CullTransparentMesh: 1 --- !u!1 &839543765 GameObject: m_ObjectHideFlags: 0 @@ -5797,7 +6144,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -0.08, y: -1.2399993} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &903653564 +--- !u!1 &891587360 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5805,115 +6152,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 903653565} - - component: {fileID: 903653568} - - component: {fileID: 903653567} - - component: {fileID: 903653566} + - component: {fileID: 891587361} + - component: {fileID: 891587364} + - component: {fileID: 891587363} + - component: {fileID: 891587362} m_Layer: 5 - m_Name: Button + m_Name: Graphic m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &903653565 +--- !u!224 &891587361 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903653564} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 891587360} + 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: - - {fileID: 1119502627} - m_Father: {fileID: 202724642} - m_RootOrder: 7 + m_Children: [] + m_Father: {fileID: 1055877578} + 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: -301.0243, y: 0} - m_SizeDelta: {x: 246.141, y: 35} + m_AnchoredPosition: {x: 0, y: 0.8} + m_SizeDelta: {x: 30.24, y: 30.24} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &903653566 +--- !u!114 &891587362 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903653564} + m_GameObject: {fileID: 891587360} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 7b30dd83a12669d4f973ff5a79ca9842, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - 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.78431374, g: 0.78431374, b: 0.78431374, 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.1 - 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: 903653567} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1423699437} - m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.Editor, Assembly-CSharp - m_MethodName: CopyJson - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &903653567 + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &891587363 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903653564} + m_GameObject: {fileID: 891587360} 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_Color: {r: 0.49917328, g: 1, b: 0.3066038, 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: 77703dfffd29ca6439338d6adfc62c9b, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a1e215e768b7d1b4e93a60f8ce9c10fc, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5921,14 +6226,14 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 10 ---- !u!222 &903653568 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &891587364 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903653564} + m_GameObject: {fileID: 891587360} m_CullTransparentMesh: 1 --- !u!1 &908855313 GameObject: @@ -6942,6 +7247,139 @@ RectTransform: m_AnchoredPosition: {x: 231.018, y: 162.97} m_SizeDelta: {x: 817.953, y: 314.07} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1055877577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1055877578} + - component: {fileID: 1055877581} + - component: {fileID: 1055877580} + - component: {fileID: 1055877579} + m_Layer: 5 + m_Name: Music Select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1055877578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055877577} + 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: 891587361} + m_Father: {fileID: 202724642} + m_RootOrder: 7 + 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: 215.7, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1055877579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055877577} + 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: 1055877580} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 423099699} + m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.CommandManager, Assembly-CSharp + m_MethodName: Redo + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1055877580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055877577} + 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: 21300000, guid: 77703dfffd29ca6439338d6adfc62c9b, type: 3} + 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 &1055877581 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055877577} + m_CullTransparentMesh: 1 --- !u!1 &1056099131 GameObject: m_ObjectHideFlags: 0 @@ -7238,6 +7676,97 @@ CanvasGroup: m_Interactable: 0 m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 +--- !u!1 &1090919177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1090919178} + - component: {fileID: 1090919181} + - component: {fileID: 1090919180} + - component: {fileID: 1090919179} + m_Layer: 5 + m_Name: Graphic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1090919178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1090919177} + 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: 3236231} + 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: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1090919179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1090919177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b30dd83a12669d4f973ff5a79ca9842, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &1090919180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1090919177} + 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.6132076, g: 0.6132076, b: 0.6132076, 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: 49e59e302f4a24a4da56bd63185fcb01, 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 &1090919181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1090919177} + m_CullTransparentMesh: 1 --- !u!1 &1110073994 GameObject: m_ObjectHideFlags: 0 @@ -7275,140 +7804,6 @@ RectTransform: m_AnchoredPosition: {x: -382, y: 147.99997} m_SizeDelta: {x: 515.94, y: 344} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1119502626 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1119502627} - - component: {fileID: 1119502629} - - component: {fileID: 1119502628} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1119502627 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119502626} - 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: 903653565} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1119502628 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119502626} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Copy Json - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2} - m_sharedMaterial: {fileID: -5829441969153149921, guid: c2df694f599b22b42817910ff570a9df, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1119502629 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119502626} - m_CullTransparentMesh: 1 --- !u!1 &1128012797 GameObject: m_ObjectHideFlags: 0 @@ -9427,6 +9822,8 @@ MonoBehaviour: SaveBTN: {fileID: 678553526} UndoBTN: {fileID: 1747099763} RedoBTN: {fileID: 2131880462} + MusicSelectBTN: {fileID: 1055877579} + EditorSettingsBTN: {fileID: 3236232} --- !u!114 &1423699438 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9665,6 +10062,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1474986787} m_CullTransparentMesh: 1 +--- !u!1 &1507800755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1507800756} + - component: {fileID: 1507800758} + - component: {fileID: 1507800757} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1507800756 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507800755} + 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: 2051557111} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -25} + m_SizeDelta: {x: 730.58, y: 82.37} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1507800757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507800755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Level + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 35949c950a936b744936efd75ae436ea, type: 2} + m_sharedMaterial: {fileID: -212896991529246517, guid: 35949c950a936b744936efd75ae436ea, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 54.4 + m_fontSizeBase: 54.4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1507800758 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507800755} + m_CullTransparentMesh: 1 --- !u!1 &1511927530 GameObject: m_ObjectHideFlags: 0 @@ -11458,6 +11989,7 @@ RectTransform: - {fileID: 703340359} - {fileID: 1344377689} - {fileID: 1090036110} + - {fileID: 1946344931} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12093,6 +12625,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1928361018} m_CullTransparentMesh: 1 +--- !u!1 &1946344930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1946344931} + m_Layer: 5 + m_Name: Dialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1946344931 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946344930} + 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: + - {fileID: 830672829} + - {fileID: 2051557111} + m_Father: {fileID: 1791483803} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1953621881 GameObject: m_ObjectHideFlags: 0 @@ -12733,6 +13302,44 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e55bddfe16e69224c8c4b4eb165695d4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2051557110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2051557111} + m_Layer: 5 + m_Name: Main + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2051557111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051557110} + 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: + - {fileID: 112206234} + - {fileID: 343854783} + - {fileID: 1507800756} + m_Father: {fileID: 1946344931} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -30, y: -30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2066632679 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/SpaceSoccer/Kicker.cs b/Assets/Scripts/Games/SpaceSoccer/Kicker.cs index 380bf4f6d..c3e39fd4f 100644 --- a/Assets/Scripts/Games/SpaceSoccer/Kicker.cs +++ b/Assets/Scripts/Games/SpaceSoccer/Kicker.cs @@ -171,7 +171,6 @@ namespace RhythmHeavenMania.Games.SpaceSoccer { if ((highKicks[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && highKicks[i].beat + 1f > Conductor.instance.songPositionInBeats) { - print("bruh"); canHighKick = true; canKick = false; break; diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs index d325729e4..efa66ac28 100644 --- a/Assets/Scripts/GlobalGameManager.cs +++ b/Assets/Scripts/GlobalGameManager.cs @@ -37,11 +37,11 @@ namespace RhythmHeavenMania loadedScene = 0; fadeDuration = 0; - GameObject ui = new GameObject(); + /*GameObject ui = new GameObject(); ui.AddComponent().sprite = Resources.Load("tempBuildUI"); ui.GetComponent().sortingOrder = 1000; ui.layer = 5; - ui.name = "tempBuildUI"; + ui.name = "tempBuildUI";*/ } public void Awake() diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 2d3582b0e..f4589b986 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -34,6 +34,8 @@ namespace RhythmHeavenMania.Editor [SerializeField] private Button SaveBTN; [SerializeField] private Button UndoBTN; [SerializeField] private Button RedoBTN; + [SerializeField] private Button MusicSelectBTN; + [SerializeField] private Button EditorSettingsBTN; public static List EventObjs = new List(); @@ -67,6 +69,8 @@ namespace RhythmHeavenMania.Editor Tooltip.AddTooltip(SaveBTN.gameObject, "Save Project [Ctrl+S]\nSave Project As [Ctrl+Alt+S]"); Tooltip.AddTooltip(UndoBTN.gameObject, "Undo [Ctrl+Z]"); Tooltip.AddTooltip(RedoBTN.gameObject, "Redo [Ctrl+Y or Ctrl+Shift+Z]"); + Tooltip.AddTooltip(MusicSelectBTN.gameObject, "Music Select"); + Tooltip.AddTooltip(EditorSettingsBTN.gameObject, "Editor Settings [Ctrl+O]"); } public void Update() diff --git a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs index 557c8bd4b..a3ab66e71 100644 --- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs @@ -250,6 +250,19 @@ namespace RhythmHeavenMania.Editor.Track TimelineContent.transform.localPosition = new Vector3(Mathf.Clamp(TimelineContent.transform.localPosition.x, Mathf.NegativeInfinity, 0), TimelineContent.transform.localPosition.y); CurrentTempo.text = $" = {Conductor.instance.songBpm}"; + + if (Input.GetKeyDown(KeyCode.Alpha1)) + { + timelineState.SetState(true, false, false); + } + else if (Input.GetKeyDown(KeyCode.Alpha2)) + { + timelineState.SetState(false, true, false); + } + else if (Input.GetKeyDown(KeyCode.Alpha3)) + { + timelineState.SetState(false, false, true); + } } private void SliderControl()