feat: ScriptableLogic フィールド初期値に対応

pspkurara · Nov 6, 2020 · 4c33f1f · 4c33f1f
1 parent 477b0d4
commit 4c33f1f
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 1 deletion.
diff --git a/Packages/uGUI-Skinner/Editor/SkinPartsInspector/ScriptableLogicInspector.cs b/Packages/uGUI-Skinner/Editor/SkinPartsInspector/ScriptableLogicInspector.cs
@@ -79,6 +79,7 @@ public void DrawInspector(EditorSkinPartsPropertry property)
 			SkinnerEditorUtility.ResetArray(property.objectReferenceValues, ScriptableLogic.RequiredObjectLength, false);
 
 			var logicProperty = property.objectReferenceValues.GetArrayElementAtIndex(ScriptableLogic.LogicIndex);
+			var preSelectLogic = logicProperty.objectReferenceValue as UserLogic;
 			SkinnerEditorGUILayout.ObjectField(SkinContent.Logic, logicProperty, typeof(UserLogic)); ;
 
 			if (logicProperty.hasMultipleDifferentValues) return;
@@ -91,6 +92,14 @@ public void DrawInspector(EditorSkinPartsPropertry property)
 				SkinnerEditorUtility.ResetArray(property.floatValues, current.FloatArrayCount);
 				SkinnerEditorUtility.ResetArray(property.vector4Values, current.Vector4ArrayCount);
 				SkinnerEditorUtility.ResetArray(property.stringValues, current.StringArrayCount);
+
+				logicProperty.objectReferenceValue = userLogic;
+
+				if (preSelectLogic != userLogic)
+				{
+					InitializeFields(property);
+				}
+
 				for (int i = 0; i < current.VariableDisplayDatas.Count; i++)
 				{
 					var v = current.VariableDisplayDatas[i];
@@ -231,6 +240,57 @@ public void DrawInspector(EditorSkinPartsPropertry property)
 			}
 		}
 
+		/// <summary>
+		/// 表示データを元にフィールドを全て初期化する
+		/// </summary>
+		/// <param name="property">property</param>
+		private void InitializeFields(EditorSkinPartsPropertry property)
+		{
+			for (int i = 0; i < current.VariableDisplayDatas.Count; i++)
+			{
+				var v = current.VariableDisplayDatas[i];
+
+				SerializedProperty element = null;
+				switch (v.PropertyType)
+				{
+					case SerializedPropertyType.ObjectReference:
+						{
+							element = property.objectReferenceValues.GetArrayElementAtIndex(v.FieldIndex + ScriptableLogic.RequiredObjectLength);
+						}
+						break;
+					case SerializedPropertyType.Float:
+					case SerializedPropertyType.Boolean:
+					case SerializedPropertyType.Integer:
+					case SerializedPropertyType.LayerMask:
+					case SerializedPropertyType.Enum:
+						{
+							element = property.floatValues.GetArrayElementAtIndex(v.FieldIndex);
+						}
+						break;
+					case SerializedPropertyType.Vector2:
+					case SerializedPropertyType.Vector3:
+					case SerializedPropertyType.Vector4:
+					case SerializedPropertyType.Color:
+					case SerializedPropertyType.Rect:
+						{
+							element = property.vector4Values.GetArrayElementAtIndex(v.FieldIndex);
+						}
+						break;
+					case SerializedPropertyType.Character:
+					case SerializedPropertyType.String:
+						{
+							element = property.stringValues.GetArrayElementAtIndex(v.FieldIndex);
+						}
+						break;
+				}
+
+				if (element != null)
+				{
+					SkinnerEditorUtility.FieldClean(element, v.VariableData.DefaultValue);
+				}
+			}
+		}
+
 		/// <summary>
 		/// インスペクター用表示データを生成して初期化する
 		/// </summary>

diff --git a/Packages/uGUI-Skinner/Editor/SkinnerEditorUtility.cs b/Packages/uGUI-Skinner/Editor/SkinnerEditorUtility.cs
@@ -79,7 +79,7 @@ private static bool IsDefinedDisallowMultiplyComponent(Type type)
 
 		#endregion
 
-		private static void FieldClean(SerializedProperty arrayObj, object defaultValue)
+		public static void FieldClean(SerializedProperty arrayObj, object defaultValue)
 		{
 			bool hasDefaultValue = defaultValue != null;
 			switch (arrayObj.propertyType)

diff --git a/Packages/uGUI-Skinner/Runtime/UserLogic.cs b/Packages/uGUI-Skinner/Runtime/UserLogic.cs
@@ -111,6 +111,11 @@ public sealed class UserLogicVariable
 		/// </summary>
 		public string FieldDisplayName;
 
+		/// <summary>
+		/// 初期値
+		/// </summary>
+		public object DefaultValue;
+
 		/// <summary>
 		/// カスタムプロパティ
 		/// </summary>