SKCell v0.15.2 Update

Assets/SKCell/CSV/SKCSVLoader.cs

@@ -3,7 +3,7 @@
 
 namespace SKCell
 {
-    [AddComponentMenu("SKCell/SKCSVLoader")]
+    [AddComponentMenu("SKCell/CSV/SKCSVLoader")]
     public class SKCSVLoader : MonoSingleton<SKCSVLoader>
     {
         protected override void Awake()

Assets/SKCell/Common/SKAudioManager.cs

@@ -4,7 +4,7 @@
 
 namespace SKCell
 {
-    [AddComponentMenu("SKCell/SKAudioManager")]
+    [AddComponentMenu("SKCell/Misc/SKAudioManager")]
     public class SKAudioManager : MonoSingleton<SKAudioManager>
     {
         public AudioSource musicAudioSource;

Assets/SKCell/Common/SKCommonTimer.cs

@@ -6,7 +6,7 @@
 namespace SKCell
 {
     [ExecuteInEditMode]
-    [AddComponentMenu("SKCell/SKCommonTimer")]
+    [AddComponentMenu("SKCell/Misc/SKCommonTimer")]
     public sealed class SKCommonTimer : MonoSingleton<SKCommonTimer>
     {
         private double scaledTimer = 0f;

Assets/SKCell/Common/SKReferenceHolder.cs

@@ -5,7 +5,7 @@
 using TMPro;
 
 namespace SKCell {
-    [AddComponentMenu("SKCell/SKReferenceHolder")]
+    [AddComponentMenu("SKCell/Misc/SKReferenceHolder")]
     public class SKReferenceHolder : MonoBehaviour
     {
         [SKFolder("Basic")]

Assets/SKCell/Common/SKSceneManager.cs

@@ -7,7 +7,7 @@
 
 namespace SKCell
 {
-    [AddComponentMenu("SKCell/SKSceneManager")]
+    [AddComponentMenu("SKCell/Misc/SKSceneManager")]
 
     public class SKSceneManager : MonoSingleton<SKSceneManager>
     {

Assets/SKCell/Console/SKConsole.cs

@@ -8,10 +8,12 @@
 
 namespace SKCell
 {
+    [AddComponentMenu("SKCell/Console/SKConsole")]
     public class SKConsole : MonoSingleton<SKConsole>
     {
         [SKInspectorText("Please click on < Generate Structure > \nto start using SKConsole for the first time.")]
         [SerializeField] int descrip_text;
+        public bool activeOnAwake = false;
         public static bool IsOpen { get { return instance.gameObject.activeSelf; } }
         static SKConsoleCommand root = new SKConsoleCommand();
 
@@ -24,14 +26,19 @@ public class SKConsole : MonoSingleton<SKConsole>
         private Stack<SKConsoleCommand> currentCommandStack = new Stack<SKConsoleCommand>();
         public Dictionary<string, SKConsoleCommand> commandLookup;
 
-        private void Start()
+        protected override void Awake()
         {
+            base.Awake();
             inputField.onValueChanged.AddListener(OnInputValueChanged);
             inputField.onEndEdit.AddListener(OnInputComplete);
-            
+
             currentCommandStack.Push(root);
             commandLookup = new Dictionary<string, SKConsoleCommand>();
             PopulateCommandLookup(root);
+
+            gameObject.SetActive(activeOnAwake);
+            if (activeOnAwake)
+                Open();
         }
 
         #region Public Methods

Assets/SKCell/Core/SKCore.cs

@@ -17,10 +17,10 @@ namespace SKCell
     [DisallowMultipleComponent]
     [RequireComponent(typeof(SKCommonTimer))]
     [RequireComponent(typeof(SKPoolManager))]
-    [AddComponentMenu("SKCell/SKCore")]
+    [AddComponentMenu("SKCell/Core/SKCore")]
     public sealed class SKCore : MonoSingleton<SKCore>
     {
-        public const string SKCELL_VERSION = "v0.15.1";
+        public const string SKCELL_VERSION = "v0.15.2";
 
         public static Action Awake000 = new Action(EmptyAction), Awake100 = new Action(EmptyAction),
                               Start000 = new Action(EmptyAction), Start100 = new Action(EmptyAction), Start200 = new Action(EmptyAction),

Assets/SKCell/Dialogue/Dialogue 101.asset

@@ -51,8 +51,8 @@ MonoBehaviour:
     uid: 164022
     rect:
       serializedVersion: 2
-      x: 1080.1111
-      y: 813.8889
+      x: 1077.1111
+      y: 807.8889
       width: 100
       height: 130
     oRect:
@@ -679,8 +679,8 @@ MonoBehaviour:
     uid: 612312
     rect:
       serializedVersion: 2
-      x: 1186.1111
-      y: 1358.8889
+      x: 1149.1111
+      y: 1327.8889
       width: 100
       height: 80
     oRect:

Assets/SKCell/Dialogue/SKDialoguePlayer.cs

@@ -6,6 +6,7 @@
 
 namespace SKCell
 {
+    [AddComponentMenu("SKCell/Dialogue/SKDialoguePlayer")]
     public class SKDialoguePlayer : MonoBehaviour
     {
         public SKDialogueAsset asset;

Assets/SKCell/Editor/SKHierarchy.cs → Assets/SKCell/Editor/Hierarchy/SKHierarchy.cs

@@ -26,16 +26,9 @@ public class SKHierarchy
 
         static SKHierarchy()
         {
-            SKAssetLibrary.ClearTextureCache();
-
             EditorApplication.hierarchyWindowItemOnGUI += HandleHierarchyWindowItemOnGUI;
 
-            srContent = new GUIContent(SKAssetLibrary.LoadTexture($"ObjectIcons/obj_icon_7"));
-            cldContent = new GUIContent(SKAssetLibrary.LoadTexture($"ObjectIcons/obj_icon_11"));
-            folderTexture = SKAssetLibrary.LoadTexture($"ObjectIcons/obj_icon_1");
-            crossContent = new GUIContent(SKAssetLibrary.LoadTexture($"cross_1"));
-            resetContent = new GUIContent(SKAssetLibrary.LoadTexture($"return"));
-
+            LoadResources();
             rename_Style = new GUIStyle();
             rename_Style.fixedHeight = 10;
             rename_Style.fixedWidth = 10;
@@ -47,7 +40,7 @@ static SKHierarchy()
             normalTexture.Apply();
 
             Texture2D hoverTexture = new Texture2D(1, 1);
-            hoverTexture.SetPixel(0, 0, new Color(1, 1, 1, 0.2f)); 
+            hoverTexture.SetPixel(0, 0, new Color(1, 1, 1, 0.2f));
             hoverTexture.Apply();
 
             transparentButtonStyle.normal.background = normalTexture;
@@ -60,7 +53,7 @@ static SKHierarchy()
             normalTexture.Apply();
 
             hoverTexture = new Texture2D(1, 1);
-            hoverTexture.SetPixel(0, 0, new Color(.4f, .4f, .4f, 0.9f)); 
+            hoverTexture.SetPixel(0, 0, new Color(.4f, .4f, .4f, 0.9f));
             hoverTexture.Apply();
 
             blackButtonStyle.normal.background = normalTexture;
@@ -69,9 +62,22 @@ static SKHierarchy()
             highlightColorSolid.a = 1;
         }
 
-
+        private static void LoadResources()
+        {
+            SKAssetLibrary.ClearTextureCache();
+            srContent = new GUIContent(SKAssetLibrary.LoadTexture($"ObjectIcons/obj_icon_7"));
+            cldContent = new GUIContent(SKAssetLibrary.LoadTexture($"ObjectIcons/obj_icon_11"));
+            folderTexture = SKAssetLibrary.LoadTexture($"ObjectIcons/obj_icon_1");
+            crossContent = new GUIContent(SKAssetLibrary.LoadTexture($"cross_1"));
+            resetContent = new GUIContent(SKAssetLibrary.LoadTexture($"return"));
+        }
+
         private static void HandleHierarchyWindowItemOnGUI(int instanceID, Rect selectionRect)
         {
+            if (folderTexture==null)
+            {
+                LoadResources();
+            }
             GameObject _object = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
             GameObject obj = _object as GameObject;
             //separators
@@ -158,30 +164,38 @@ private static void HandleHierarchyWindowItemOnGUI(int instanceID, Rect selectio
             }
 
 
-
-            Rect iconRect = new Rect(selectionRect);
-            iconRect.xMin -= 0;
-            iconRect.xMax = iconRect.xMin + 16;
-            //col = Selection.activeObject == obj?new Color(.17f,.35f,.6f): new Color(.25f,.25f,.25f);
-            col =new Color(.25f,.25f,.25f);
-            EditorGUI.DrawRect(iconRect, col);
-            if (!isSeparator)
+            if (obj != null)
             {
-                GUI.DrawTexture(iconRect, GetHierarchyIcon(obj));
-
-                if (GUI.Button(iconRect, "", transparentButtonStyle))
+                Rect iconRect = new Rect(selectionRect);
+                iconRect.xMin -= 0;
+                iconRect.xMax = iconRect.xMin + 16;
+                //col = Selection.activeObject == obj?new Color(.17f,.35f,.6f): new Color(.25f,.25f,.25f);
+                col = new Color(.25f, .25f, .25f);
+                EditorGUI.DrawRect(iconRect, col);
+                if (!isSeparator)
                 {
-                    Vector2 screenMousePosition = GUIUtility.GUIToScreenPoint(Event.current.mousePosition);
-                    float differenceY = screenMousePosition.y - Event.current.mousePosition.y;
-                    float iconScreenY = iconRect.y + differenceY;
-                    Vector2 windowPosition = new Vector2(iconRect.x + 30, iconScreenY + 16);
-                    ObjectIconPopup.ShowWindow(windowPosition, obj);
+                    Texture tex = GetHierarchyIcon(obj);
+                    if (tex != null)
+                    {
+                        EditorGUI.DrawRect(iconRect, col);
+                        GUI.DrawTexture(iconRect, tex);
+                    }
+
+                    if (GUI.Button(iconRect, "", transparentButtonStyle))
+                    {
+                        Vector2 screenMousePosition = GUIUtility.GUIToScreenPoint(Event.current.mousePosition);
+                        float differenceY = screenMousePosition.y - Event.current.mousePosition.y;
+                        float iconScreenY = iconRect.y + differenceY;
+                        Vector2 windowPosition = new Vector2(iconRect.x + 30, iconScreenY + 16);
+                        ObjectIconPopup.ShowWindow(windowPosition, obj);
 
+                    }
+                }
+                else
+                {                
+                    EditorGUI.DrawRect(iconRect, col);
+                    GUI.DrawTexture(iconRect, folderTexture);
                 }
-            }
-            else
-            {
-                GUI.DrawTexture(iconRect, folderTexture);
             }
 
         }