From 3a3eb803efd9ec7d320797edf476e23710c51f35 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 21 Jan 2024 19:43:29 -0500 Subject: [PATCH] default timing display is non-lazer plan for future overlays? --- Assets/Scripts/PersistentDataManager.cs | 4 +- Assets/Scripts/UI/Overlays/OverlaysManager.cs | 77 +++++++++++++++---- ...Generator.Editor.ProjectSettingsData.asset | 2 + 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/Assets/Scripts/PersistentDataManager.cs b/Assets/Scripts/PersistentDataManager.cs index adcddb2b4..e0df0eb14 100644 --- a/Assets/Scripts/PersistentDataManager.cs +++ b/Assets/Scripts/PersistentDataManager.cs @@ -48,7 +48,7 @@ namespace HeavenStudio.Common gameSettings.timingDisplayComponents = new List() { - OverlaysManager.TimingDisplayComponent.CreateDefaultDual() + OverlaysManager.TimingDisplayComponent.CreateDefaultSingle() }; gameSettings.skillStarComponents = new List() { @@ -186,6 +186,8 @@ namespace HeavenStudio.Common public List timingDisplayComponents; public List skillStarComponents; public List sectionComponents; + // public List durationComponents; + // public List wordJudgementComponents; } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Overlays/OverlaysManager.cs b/Assets/Scripts/UI/Overlays/OverlaysManager.cs index a789aeadd..729ffce8f 100644 --- a/Assets/Scripts/UI/Overlays/OverlaysManager.cs +++ b/Assets/Scripts/UI/Overlays/OverlaysManager.cs @@ -26,11 +26,17 @@ namespace HeavenStudio.Common List lytElements = new List(); - public static bool OverlaysReady {get { return instance != null && - TimingAccuracyDisplay.instance != null && - SkillStarManager.instance != null && + public static bool OverlaysReady + { + get + { + return instance != null && + TimingAccuracyDisplay.instance != null && + SkillStarManager.instance != null && SectionMedalsManager.instance != null && - HeavenStudio.Games.Global.Textbox.instance != null;}} + HeavenStudio.Games.Global.Textbox.instance != null; + } + } // Start is called before the first frame update public void Start() @@ -42,7 +48,7 @@ namespace HeavenStudio.Common // Update is called once per frame void Update() { - + } public void TogleOverlaysVisibility(bool visible) @@ -87,16 +93,19 @@ namespace HeavenStudio.Common foreach (var c in lytElements) { - if (c is TimingDisplayComponent) { - c.CreateElement(TimingDisplayPrefab, ComponentHolder); + if (c is TimingDisplayComponent) + { + c.CreateElement(TimingDisplayPrefab, ComponentHolder); Debug.Log("Create TimingDisplayComponent"); } - else if (c is SkillStarComponent) { - c.CreateElement(SkillStarPrefab, ComponentHolder); + else if (c is SkillStarComponent) + { + c.CreateElement(SkillStarPrefab, ComponentHolder); Debug.Log("Create SkillStarComponent"); } - else if (c is SectionComponent) { - c.CreateElement(ChartSectionPrefab, ComponentHolder); + else if (c is SectionComponent) + { + c.CreateElement(ChartSectionPrefab, ComponentHolder); Debug.Log("Create SectionComponent"); } c.PositionElement(); @@ -114,7 +123,7 @@ namespace HeavenStudio.Common c.PositionElement(); } } - + [Serializable] public class TimingDisplayComponent : OverlayOption { @@ -169,10 +178,10 @@ namespace HeavenStudio.Common break; } } - } + } - public override void EnablePreview() {} - public override void DisablePreview() {} + public override void EnablePreview() { } + public override void DisablePreview() { } public static TimingDisplayComponent CreateDefaultDual() { @@ -263,6 +272,44 @@ namespace HeavenStudio.Common } + [Serializable] + public class DurationComponent : OverlayOption + { + public override void DisablePreview() + { + throw new NotImplementedException(); + } + + public override void EnablePreview() + { + throw new NotImplementedException(); + } + + public override void PositionElement() + { + throw new NotImplementedException(); + } + } + + [Serializable] + public class WordJudgementComponent : OverlayOption + { + public override void DisablePreview() + { + throw new NotImplementedException(); + } + + public override void EnablePreview() + { + throw new NotImplementedException(); + } + + public override void PositionElement() + { + throw new NotImplementedException(); + } + } + [Serializable] public abstract class OverlayOption { diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 8a26babb5..f446a9e3f 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -42,5 +42,7 @@ MonoBehaviour: - Assets/Scripts/LevelEditor/Editor.cs - Assets/Scripts/Common/MemRenderer.cs - Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs + - Assets/Scripts/PersistentDataManager.cs + - Assets/Scripts/UI/Overlays/OverlaysManager.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []