From cb2b5707e93faa479d97cee9e83c4095e1d6a38f Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sat, 3 Sep 2022 22:29:50 -0400 Subject: [PATCH] headers and subheaders --- Assets/Scenes/Editor.unity | 433 +++++++++++++++++- .../RemixPropertiesDialog.cs | 8 +- .../Tabs/ChartInfoProperties.cs | 17 +- 3 files changed, 432 insertions(+), 26 deletions(-) diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 0036ba7e..61b46aae 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -2349,6 +2349,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 78689442} m_CullTransparentMesh: 1 +--- !u!1 &81650874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 81650875} + - component: {fileID: 81650877} + - component: {fileID: 81650876} + 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 &81650875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81650874} + 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: 1172723235} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_SizeDelta: {x: 582.5, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &81650876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81650874} + 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: 'Heading Small - ABCDEFGHIJKLMNOPQRSTUVWXYZ + + AWWWWWWW BWWWWWWW' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 78e7291cdeccdfc4fa61249845605144, type: 2} + m_sharedMaterial: {fileID: 5250768452915780979, guid: 78e7291cdeccdfc4fa61249845605144, 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: 22 + m_fontSizeBase: 22 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 3 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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 &81650877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81650874} + m_CullTransparentMesh: 1 --- !u!1 &86022610 GameObject: m_ObjectHideFlags: 0 @@ -19295,7 +19431,7 @@ RectTransform: - {fileID: 1516873910} - {fileID: 330515827} m_Father: {fileID: 1776319213} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21045,17 +21181,17 @@ RectTransform: m_GameObject: {fileID: 797336683} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99991256, y: 0.99991256, z: 0.99991256} + m_LocalScale: {x: 0.9999127, y: 0.9999127, z: 0.9999127} m_Children: - {fileID: 1972054042} - {fileID: 1107362315} - {fileID: 1468840905} m_Father: {fileID: 1776319213} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 51.5, y: 112.784744} + m_AnchoredPosition: {x: 41.5, y: 112.81616} m_SizeDelta: {x: 1165, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &797336685 @@ -23077,7 +23213,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1589389271} m_Direction: 2 m_Value: 1 - m_Size: 1 + m_Size: 0.9996455 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -23135,6 +23271,140 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 1, b: 1, a: 1} m_EffectDistance: {x: 2, y: -2} m_UseGraphicAlpha: 1 +--- !u!1 &918768360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 918768361} + - component: {fileID: 918768363} + - component: {fileID: 918768362} + 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 &918768361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 918768360} + 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: 934666995} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_SizeDelta: {x: 1165, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &918768362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 918768360} + 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: Heading Big + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 78e7291cdeccdfc4fa61249845605144, type: 2} + m_sharedMaterial: {fileID: 5250768452915780979, guid: 78e7291cdeccdfc4fa61249845605144, 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: 42 + m_fontSizeBase: 42 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 3 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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 &918768363 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 918768360} + m_CullTransparentMesh: 1 --- !u!1 &921242772 GameObject: m_ObjectHideFlags: 0 @@ -23811,6 +24081,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 933578816} m_CullTransparentMesh: 1 +--- !u!1 &934666994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 934666995} + - component: {fileID: 934666996} + m_Layer: 5 + m_Name: Heading + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &934666995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 934666994} + 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: 918768361} + m_Father: {fileID: 1776319213} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 51.5, y: 107.81618} + m_SizeDelta: {x: 1165, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &934666996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 934666994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2483aa618d773c143857f608a2d2d32a, type: 3} + m_Name: + m_EditorClassIdentifier: + caption: {fileID: 918768362} + parameterManager: {fileID: 0} + propertyName: --- !u!1 &935391419 GameObject: m_ObjectHideFlags: 0 @@ -23914,17 +24236,17 @@ RectTransform: m_GameObject: {fileID: 937032842} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99991256, y: 0.99991256, z: 0.99991256} + m_LocalScale: {x: 0.9999127, y: 0.9999127, z: 0.9999127} m_Children: - {fileID: 506932089} - {fileID: 2094676609} m_Father: {fileID: 1776319213} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -31.000061, y: -91.21527} - m_SizeDelta: {x: 1000, y: 50} + m_AnchoredPosition: {x: 41.5, y: 107.81618} + m_SizeDelta: {x: 1165, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &937032844 MonoBehaviour: @@ -30104,6 +30426,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162156585} m_CullTransparentMesh: 1 +--- !u!1 &1172723234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1172723235} + - component: {fileID: 1172723236} + m_Layer: 5 + m_Name: SubHeading + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1172723235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172723234} + 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: 81650875} + m_Father: {fileID: 1776319213} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -249.75006, y: 132.81616} + m_SizeDelta: {x: 582.5, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1172723236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172723234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2483aa618d773c143857f608a2d2d32a, type: 3} + m_Name: + m_EditorClassIdentifier: + caption: {fileID: 81650876} + parameterManager: {fileID: 0} + propertyName: --- !u!1 &1177777397 GameObject: m_ObjectHideFlags: 0 @@ -30164,6 +30538,8 @@ MonoBehaviour: ColorP: {fileID: 1651196874} StringP: {fileID: 937032842} DividerP: {fileID: 1503364107} + HeaderP: {fileID: 934666994} + SubHeaderP: {fileID: 1172723234} --- !u!114 &1177777400 MonoBehaviour: m_ObjectHideFlags: 0 @@ -35228,14 +35604,26 @@ MonoBehaviour: dialog: {fileID: 1336470761} tabsManager: {fileID: 1523610372} infoTags: + - tag: header + label: Remix Information + isReadOnly: 0 + - tag: subheader + label: Enter information about your remix here. + isReadOnly: 0 - tag: remixtitle label: Remix Title isReadOnly: 0 - tag: remixauthor - label: Remix Author + label: Remix Author isReadOnly: 0 - tag: divider - label: Divider Idol + label: Divider Chart + isReadOnly: 0 + - tag: header + label: Song Information + isReadOnly: 0 + - tag: subheader + label: Enter information about your remix's song here. isReadOnly: 0 - tag: idolgenre label: Song Genre @@ -35246,6 +35634,9 @@ MonoBehaviour: - tag: idolcredit label: Song Artist isReadOnly: 0 + - tag: divider + label: Divider Idol + isReadOnly: 0 flavourTags: [] infoContainer: {fileID: 1177777399} chart: @@ -38154,7 +38545,7 @@ MonoBehaviour: m_Right: 20 m_Top: 10 m_Bottom: 5 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 6 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 @@ -38332,9 +38723,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 51.5, y: 112.86438} - m_SizeDelta: {x: 1165, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 41.5, y: 132.81616} + m_SizeDelta: {x: 1165, y: 25} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &1503364109 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38352,7 +38743,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 @@ -41680,7 +42071,7 @@ RectTransform: - {fileID: 564782388} - {fileID: 1144931393} m_Father: {fileID: 1776319213} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -42568,7 +42959,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -5} + m_AnchoredPosition: {x: 0, y: -12.5} m_SizeDelta: {x: 1165, y: 10} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1694560419 @@ -44427,12 +44818,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 937032843} - {fileID: 797336684} - {fileID: 2083473858} - {fileID: 1651196875} - {fileID: 728113666} - - {fileID: 937032843} - {fileID: 1503364108} + - {fileID: 934666995} + - {fileID: 1172723235} m_Father: {fileID: 572765322} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -51450,7 +51843,7 @@ RectTransform: - {fileID: 798238754} - {fileID: 2086758091} m_Father: {fileID: 1776319213} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs index 975aae6e..abf9b408 100644 --- a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs +++ b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs @@ -66,13 +66,13 @@ namespace HeavenStudio.Editor { infoContainer.AddDivider(this); } - else if (property.tag == "heading") + else if (property.tag == "header") { - infoContainer.AddDivider(this); + infoContainer.AddHeader(this, property.label); } - else if (property.tag == "subheading") + else if (property.tag == "subheader") { - infoContainer.AddDivider(this); + infoContainer.AddSubHeader(this, property.label); } else { diff --git a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/Tabs/ChartInfoProperties.cs b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/Tabs/ChartInfoProperties.cs index 11451865..c6d826be 100644 --- a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/Tabs/ChartInfoProperties.cs +++ b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/Tabs/ChartInfoProperties.cs @@ -20,6 +20,8 @@ namespace HeavenStudio.Editor [Header("Layout Prefabs")] [SerializeField] private GameObject DividerP; + [SerializeField] private GameObject HeaderP; + [SerializeField] private GameObject SubHeaderP; public void Init(RemixPropertiesDialog diag) { @@ -84,10 +86,21 @@ namespace HeavenStudio.Editor public void AddDivider(RemixPropertiesDialog diag) { - GameObject prefab = DividerP; - InitPrefab(prefab); + InitPrefab(DividerP); } + public void AddHeader(RemixPropertiesDialog diag, string text) + { + var input = InitPrefab(HeaderP); + input.GetComponent().InitProperties(diag, "", text); + } + + public void AddSubHeader(RemixPropertiesDialog diag, string text) + { + var input = InitPrefab(SubHeaderP); + input.GetComponent().InitProperties(diag, "", text); + } + private GameObject InitPrefab(GameObject prefab, string tooltip = "") { GameObject input = Instantiate(prefab);