Merge pull request #16 from VirtueSky/dev

Dev

README.md

@@ -23,9 +23,9 @@
 ### 1: Download the repo and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `3.0.0`
+for version `3.0.1`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.0.0",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.0.1",
 ```
 
 ## Includes modules

VirtueSky/ControlPanel/ConstantPackage.cs

@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "3.0.0";
+        public const string VersionSunflower = "3.0.1";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";

VirtueSky/Hierarchy/Editor/HierarchyEditor.asmdef

@@ -5,7 +5,8 @@
         "Virtuesky.Sunflower.DataStorage.Editor",
         "VirtueSky.Sunflower.Inspector",
         "HierarchyNullable",
-        "HierarchyRuntime"
+        "HierarchyRuntime",
+        "Virtuesky.Sunflower.UtilsEdtitor"
     ],
     "includePlatforms": [
         "Editor"

VirtueSky/Hierarchy/FolderHierarchy/HeaderHierarchy.cs

@@ -0,0 +1,36 @@
+using UnityEngine;
+using VirtueSky.Inspector;
+
+namespace VirtueSky.Hierarchy
+{
+    [ExecuteInEditMode]
+    [EditorIcon("icon_hierarchy"), HideMonoScript]
+    public class HeaderHierarchy : MonoBehaviour
+    {
+        #region Variables
+
+        public enum TextAlignment
+        {
+            Left,
+            Center
+        }
+
+        [TitleColor("Text", CustomColor.Gold, CustomColor.Aqua)] [SerializeField]
+        public bool customText;
+
+        [ShowIf(nameof(customText)), SerializeField]
+        public Color32 textColor = InspectorUtility.textNormalColor;
+
+        [Space] [SerializeField] public FontStyle textStyle = FontStyle.BoldAndItalic;
+
+        [SerializeField] public TextAlignment textAlignment = TextAlignment.Left;
+
+        [TitleColor("Highlight", CustomColor.Coral, CustomColor.Lime)] [Space, SerializeField]
+        public bool customHighlight;
+
+        [ShowIf(nameof(customHighlight)), SerializeField]
+        public Color32 highlightColor = InspectorUtility.cyanColor;
+
+        #endregion
+    } // class end
+}

VirtueSky/Hierarchy/FolderHierarchy/HeaderHierarchyIcon.cs

@@ -0,0 +1,142 @@
+#if UNITY_EDITOR
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using VirtueSky.UtilsEditor;
+
+namespace VirtueSky.Hierarchy
+{
+    [InitializeOnLoad]
+    public class HeaderHierarchyIcon
+    {
+        #region Static Variables
+
+        // icons
+        private static string assetPath = "/VirtueSky/Hierarchy/Icons";
+        private static Texture2D icon_HierarchyHighlight;
+
+        #endregion
+
+        //----------------------------------------------------------------------------------------------------
+
+        #region Contructors
+
+        static HeaderHierarchyIcon()
+        {
+            // subscribe to inspector updates
+            EditorApplication.hierarchyWindowItemOnGUI += EditorApplication_hierarchyWindowItemOnGUI;
+        }
+
+        #endregion
+
+        //----------------------------------------------------------------------------------------------------
+
+        #region Private Functions
+
+        private static void CreateHierarchyIcon_Highlight()
+        {
+            icon_HierarchyHighlight = FileExtension.FindAssetWithPath<Texture2D>("HierarchyHighlight.png", assetPath);
+        }
+
+        private static void EditorApplication_hierarchyWindowItemOnGUI(int instanceID, Rect position)
+        {
+            // check for valid draw
+            if (Event.current.type != EventType.Repaint)
+            {
+                return;
+            }
+
+            GameObject gameObject = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
+            if (gameObject != null)
+            {
+                HeaderHierarchy component = gameObject.GetComponent<HeaderHierarchy>();
+                if (component != null)
+                {
+                    // cache values
+                    int hierarchyPixelHeight = 16;
+                    bool isSelected = Selection.instanceIDs.Contains(instanceID);
+                    bool isActive = component.isActiveAndEnabled;
+                    Color32 defaultContentColor = GUI.contentColor;
+                    Color32 textColor;
+                    Color32 backgroundColor;
+
+                    if (isActive || isSelected)
+                    {
+                        // text
+                        if (component.customText)
+                        {
+                            textColor = component.textColor;
+                        }
+                        else
+                        {
+                            textColor = InspectorUtility.textNormalColor;
+                        }
+                    }
+                    else
+                    {
+                        // text
+                        if (component.customText)
+                        {
+                            textColor = (Color)component.textColor * 0.6f;
+                        }
+                        else
+                        {
+                            textColor = InspectorUtility.textDisabledColor;
+                        }
+                    }
+
+                    // draw background
+                    if (isSelected)
+                    {
+                        backgroundColor = InspectorUtility.backgroundActiveColor;
+                    }
+                    else
+                    {
+                        backgroundColor = InspectorUtility.backgroundNormalColorLight;
+                    }
+
+                    Rect backgroundPosition = new Rect(position.xMin, position.yMin, position.width + hierarchyPixelHeight, position.height);
+                    EditorGUI.DrawRect(backgroundPosition, backgroundColor);
+
+                    // check icon exists
+                    if (!icon_HierarchyHighlight)
+                    {
+                        CreateHierarchyIcon_Highlight();
+                    }
+
+                    // draw highlight
+                    if (component.customHighlight)
+                    {
+                        GUI.contentColor = component.highlightColor;
+                        Rect iconPosition = new Rect(position.xMin, position.yMin, icon_HierarchyHighlight.width, icon_HierarchyHighlight.height);
+                        GUIContent iconGUIContent = new GUIContent(icon_HierarchyHighlight);
+                        EditorGUI.LabelField(iconPosition, iconGUIContent);
+                        GUI.contentColor = defaultContentColor;
+                    }
+
+                    // draw text
+                    GUIStyle hierarchyText = new GUIStyle() { };
+                    hierarchyText.normal = new GUIStyleState() { textColor = textColor };
+                    hierarchyText.fontStyle = component.textStyle;
+                    int offsetX;
+                    if (component.textAlignment == HeaderHierarchy.TextAlignment.Center)
+                    {
+                        hierarchyText.alignment = TextAnchor.MiddleCenter;
+                        offsetX = 0;
+                    }
+                    else
+                    {
+                        hierarchyText.alignment = TextAnchor.MiddleLeft;
+                        offsetX = hierarchyPixelHeight + 2;
+                    }
+
+                    Rect textOffset = new Rect(position.xMin + offsetX, position.yMin, position.width, position.height);
+                    EditorGUI.LabelField(textOffset, component.name, hierarchyText);
+                }
+            }
+        }
+
+        #endregion
+    } // class end
+}
+#endif

VirtueSky/Hierarchy/FolderHierarchy/HierarchyHeader.asmdef

@@ -0,0 +1,17 @@
+{
+    "name": "HierarchyHeader",
+    "rootNamespace": "",
+    "references": [
+        "GUID:324caed91501a9c47a04ebfd87b68794",
+        "GUID:c904f6d969e991d459a0843b71c22ec5"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}