diff --git a/Assets/Resources/Games/djSchool.prefab.meta b/Assets/Resources/Games/djSchool.prefab.meta index 8a7b81df..a5b37467 100644 --- a/Assets/Resources/Games/djSchool.prefab.meta +++ b/Assets/Resources/Games/djSchool.prefab.meta @@ -3,5 +3,5 @@ guid: 8f935c3cf25b69746819a94756411f28 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 203cd65c..129a90fe 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -49,13 +49,12 @@ namespace HeavenStudio.Editor [SerializeField] private Button UndoBTN; [SerializeField] private Button RedoBTN; [SerializeField] private Button MusicSelectBTN; + [SerializeField] private Button EditorSettingsBTN; + [SerializeField] private Button EditorThemeBTN; [SerializeField] private Button FullScreenBTN; [SerializeField] private Button TempoFinderBTN; [SerializeField] private Button SnapDiagBTN; - [SerializeField] private Button EditorThemeBTN; - [SerializeField] private Button EditorSettingsBTN; - [Header("Tooltip")] public TMP_Text tooltipText; @@ -105,12 +104,12 @@ namespace HeavenStudio.Editor 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+Shift+O]"); Tooltip.AddTooltip(EditorThemeBTN.gameObject, "Editor Theme"); Tooltip.AddTooltip(FullScreenBTN.gameObject, "Preview [Tab]"); Tooltip.AddTooltip(TempoFinderBTN.gameObject, "Tempo Finder"); Tooltip.AddTooltip(SnapDiagBTN.gameObject, "Snap Settings"); - Tooltip.AddTooltip(EditorSettingsBTN.gameObject, "Editor Settings [Ctrl+Shift+O]"); UpdateEditorStatus(true); }