From 764a71cbe51f39ebbf1b5b1263f1f00d21fa2f7e Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 21 Jan 2024 20:18:55 -0500 Subject: [PATCH] fix broken marker rendering --- .../Textbox/TextboxExtras => Fonts}/categoryMarker.asset | 0 .../Textbox/TextboxExtras => Fonts}/categoryMarker.asset.meta | 0 .../LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs | 1 + .../SpecialTmeline/TimelineObjs/SectionTimelineObj.cs | 4 ++-- ...ging.UnitySourceGenerator.Editor.ProjectSettingsData.asset | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) rename Assets/Resources/{Sprites/UI/Common/Textbox/TextboxExtras => Fonts}/categoryMarker.asset (100%) rename Assets/Resources/{Sprites/UI/Common/Textbox/TextboxExtras => Fonts}/categoryMarker.asset.meta (100%) diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/categoryMarker.asset b/Assets/Resources/Fonts/categoryMarker.asset similarity index 100% rename from Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/categoryMarker.asset rename to Assets/Resources/Fonts/categoryMarker.asset diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/categoryMarker.asset.meta b/Assets/Resources/Fonts/categoryMarker.asset.meta similarity index 100% rename from Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/categoryMarker.asset.meta rename to Assets/Resources/Fonts/categoryMarker.asset.meta diff --git a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs index df1e3857..3c8b4146 100644 --- a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs +++ b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs @@ -65,6 +65,7 @@ public class SectionDialog : Dialog sectionName.text = sectionObj.chartEntity["sectionName"]; challengeEnable.isOn = sectionObj.chartEntity["startPerfect"]; markerWeight.value = sectionObj.chartEntity["weight"]; + markerWeightManual.text = sectionObj.chartEntity["weight"].ToString("0.0"); markerWeight.maxValue = MAX_WEIGHT; markerWeight.minValue = MIN_WEIGHT; diff --git a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs index 6639e571..9965457e 100644 --- a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs +++ b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs @@ -31,9 +31,9 @@ namespace HeavenStudio.Editor.Track { // if (string.IsNullOrEmpty(chartEntity["sectionName"])) - sectionLabel.text = $" x{chartEntity["weight"]:0}"; + sectionLabel.text = $" x{chartEntity["weight"]:0.0}"; else - sectionLabel.text = $" x{chartEntity["weight"]:0} | {chartEntity["sectionName"]}"; + sectionLabel.text = $" x{chartEntity["weight"]:0.0} | {chartEntity["sectionName"]}"; if (!moving) SetX(chartEntity); } diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 7a174352..7a356bfb 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -46,5 +46,6 @@ MonoBehaviour: - Assets/Scripts/UI/Overlays/OverlaysManager.cs - Assets/Scripts/TitleManager.cs - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []