Merge pull request #8 from Pechenka472/main

Fix items header
ooonush · Jul 14, 2023 · ebaa43a · ebaa43a
2 parents 492d80f + 23d60a1
commit ebaa43a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 26 deletions.
diff --git a/Assets/Plugins/Stats/Editor/StatsEditorHelper.cs b/Assets/Plugins/Stats/Editor/StatsEditorHelper.cs
@@ -7,9 +7,12 @@ namespace Stats.Editor
 {
     public static class StatsEditorHelper
     {
-        public static string GetStatItemHeader (StatItem statItem, string label)
+        private const BindingFlags Flags = BindingFlags.Default | BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy;
+
+        public static string GetStatItemHeader (StatItem statItem, SerializedProperty property)
         {
-            return $"{label}: {statItem.Base}";
+            var itemName = GetItemName<StatItem>(property);
+            return statItem.StatType == null ? itemName : $"{itemName}: {statItem.Base}";
         }
 
         public static string GetRuntimeStatHeader(IRuntimeStat runtimeStat)
@@ -25,25 +28,25 @@ public static string GetRuntimeStatHeader(IRuntimeStat runtimeStat)
             return $"{name}: {value - modifiersValue} {modifiersText}";
         }
 
-        public static string GetAttributeItemHeader(AttributeItem attributeItem, string label)
+        public static string GetAttributeItemHeader(AttributeItem attributeItem, SerializedProperty property)
         {
-            float startPercent = attributeItem.StartPercent;
+            var startPercent = attributeItem.StartPercent;
+            var itemName = GetItemName<AttributeItem>(property);
 
-            return $"{label}: {Math.Round(startPercent * 100, 1)}%";
+            return attributeItem.AttributeType == null ? itemName : $"{itemName}: {Math.Round(startPercent * 100, 1)}%";
         }
 
         public static string GetRuntimeAttributeHeader(IRuntimeAttribute runtimeAttribute)
         {
-            string name = runtimeAttribute.AttributeType.name;
-            float value = runtimeAttribute.Value;
-            float maxValue = runtimeAttribute.MaxValue;
+            var name = runtimeAttribute.AttributeType.name;
+            var value = runtimeAttribute.Value;
+            var maxValue = runtimeAttribute.MaxValue;
 
             return $"{name}: {value} / {maxValue}";
         }
 
         public static T GetValue<T>(SerializedProperty property)
         {
-            BindingFlags bindingFlags = BindingFlags.Default | BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy;
             object obj = property.serializedObject.targetObject;
 
             string[] path = property.propertyPath.Split('.');
@@ -60,7 +63,7 @@ public static T GetValue<T>(SerializedProperty property)
                 FieldInfo field = null;
                 while (field == null)
                 {
-                    field = type.GetField(path[i], bindingFlags);
+                    field = type.GetField(path[i], Flags);
 
                     if (field == null)
                     {
@@ -75,24 +78,35 @@ public static T GetValue<T>(SerializedProperty property)
             return (T)obj;
         }
 
-        public static string GetLabel<T>(SerializedProperty property)
+        private static string GetItemName<T>(SerializedProperty property)
         {
             if (property.name == "data" && property.depth > 0 && property.displayName.Contains("Element"))
             {
-                return GetTypeName<T>(property);
+                return GetItemTypeName<T>(property);
             }
 
             return property.displayName;
         }
 
-        private static string GetTypeName<T>(SerializedProperty property)
+        private static string GetItemTypeName<T>(SerializedProperty property)
         {
+            var label = "";
+
             if (typeof(T) == typeof(AttributeItem))
             {
-                return GetValue<AttributeItem>(property).AttributeType.name;
+                AttributeType type = GetValue<AttributeItem>(property).AttributeType;
+
+                label = type == null ? "<color=yellow>Select Attribute</color>" : type.name;
+            }
+
+            if (typeof(T) == typeof(StatItem))
+            {
+                StatType type = GetValue<StatItem>(property).StatType;
+
+                label = type == null ? "<color=yellow>Select Stat</color>" : type.name;
             }
 
-            return typeof(T) == typeof(StatItem) ? GetValue<StatItem>(property).StatType.name : "";
+            return label;
         }
     }
 }
diff --git a/Assets/Plugins/Stats/Editor/TraitsEditor.cs b/Assets/Plugins/Stats/Editor/TraitsEditor.cs
@@ -1,6 +1,6 @@
-using System.Reflection;
+using System;
 using UnityEditor;
-using UnityEditor.UIElements;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Stats.Editor

diff --git a/Assets/Plugins/Stats/Editor/VisualElements/AttributeItemElement.cs b/Assets/Plugins/Stats/Editor/VisualElements/AttributeItemElement.cs
@@ -138,10 +138,7 @@ private void RepaintPercent(bool isShow)
 
         private void UpdateHeaderText()
         {
-            AttributeType attributeValue = _oldAttributeType;
-            _foldout.text = !attributeValue ? "<color=yellow>Select Attribute</color>"
-                : StatsEditorHelper.GetAttributeItemHeader(_attributeItem,
-                    StatsEditorHelper.GetLabel<AttributeItem>(_property));
+            _foldout.text = StatsEditorHelper.GetAttributeItemHeader(_attributeItem, _property);
         }
     }
 }
diff --git a/Assets/Plugins/Stats/Editor/VisualElements/StatItemElement.cs b/Assets/Plugins/Stats/Editor/VisualElements/StatItemElement.cs
@@ -187,9 +187,7 @@ private void ResetValue()
 
         private void UpdateHeaderText()
         {
-            _foldout.text = _stat.objectReferenceValue == null ? 
-                "<color=yellow>Select Stat</color>" : 
-                StatsEditorHelper.GetStatItemHeader(_statItem, StatsEditorHelper.GetLabel<StatItem>(_property));
+            _foldout.text = StatsEditorHelper.GetStatItemHeader(_statItem, _property);
         }
     }
 }
diff --git a/Assets/Plugins/Stats/Runtime/Core/AttributeItem.cs b/Assets/Plugins/Stats/Runtime/Core/AttributeItem.cs
@@ -11,7 +11,7 @@ public sealed class AttributeItem
         [SerializeField] private bool _changeStartPercent;
         [SerializeField] [Range(0f, 1f)] private float _startPercent = 1f;
 
-        public AttributeType AttributeType => _attributeType;
+        public AttributeType AttributeType => _attributeType? _attributeType : null;
 
         public float MinValue => _attributeType ? _attributeType.MinValue : 0f;
         public StatType MaxValueType => _attributeType ? _attributeType.MaxValueType : null;

diff --git a/Assets/Plugins/Stats/Runtime/Core/StatItem.cs b/Assets/Plugins/Stats/Runtime/Core/StatItem.cs
@@ -14,7 +14,7 @@ public sealed class StatItem
         [SerializeField] private bool _changeFormula;
         [SerializeField] private StatFormula _formula;
 
-        public StatType StatType => _stat.Type;
+        public StatType StatType => _stat? _stat.Type : null;
 
         public float Base
         {