Browse Source

Upgraded GameModule layout

James Peret 2 years ago
parent
commit
d555e597b5
2 changed files with 6 additions and 2 deletions
  1. 3 0
      Runtime/UiManager.cs
  2. 3 2
      Runtime/UiSystemModule.cs

+ 3 - 0
Runtime/UiManager.cs

@@ -74,6 +74,7 @@ namespace KairoEngine.UI
 
         public static void ShowElement(IUiSystemElement element)
         {
+            if(instance == null) return;
             for (int i = 0; i < instance.uiElements.Count; i++)
             {
                 if(instance.uiElements[i].element == element) 
@@ -87,6 +88,7 @@ namespace KairoEngine.UI
 
         public static void ShowElement(string title)
         {
+            if(instance == null) return;
             for (int i = 0; i < instance.uiElements.Count; i++)
             {
                 if(instance.uiElements[i].title == title) 
@@ -99,6 +101,7 @@ namespace KairoEngine.UI
 
         public static void HideElement(IUiSystemElement element)
         {
+            if(instance == null) return;
             for (int i = 0; i < instance.uiElements.Count; i++)
             {
                 if(instance.uiElements[i].element == element) 

+ 3 - 2
Runtime/UiSystemModule.cs

@@ -8,12 +8,12 @@ using Sirenix.OdinInspector;
 
 namespace KairoEngine.UI
 {
-    [Serializable, HideReferenceObjectPicker]
+    [Serializable, HideReferenceObjectPicker, Toggle("enableModule")]
     public class UiSystemModule : GameModuleBase
     {
         public override string name => "UI Module";
 
-        [FoldoutGroup("@name"), InlineEditor(InlineEditorObjectFieldModes.Boxed), LabelText("UI Library"), NonSerialized, ShowInInspector] 
+        [InlineEditor(InlineEditorObjectFieldModes.Boxed), LabelText("UI Library"), NonSerialized, ShowInInspector] 
         public UiSystemLibrary library;
 
         public UiSystemModule(GameConfig config) : base(config)
@@ -21,6 +21,7 @@ namespace KairoEngine.UI
             this.gameConfig = config;
             this.className = this.GetType().AssemblyQualifiedName;
             this.typeName = "UiSystemModule";
+            this.enableModule = true;
         } 
 
         public override void Load(Transform parent)