fix: 全てのオブジェクトにRecordObjectが行われるように修正

pspkurara · Nov 6, 2020 · 78eb45f · 78eb45f
1 parent 8575729
commit 78eb45f
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 1 deletion.
diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/AnimationSample.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/AnimationSample.cs
@@ -46,6 +46,7 @@ public void SetValues(SkinLogicProperty property)
 				//値がないなら何もしない
 				if (property.floatValues.Count < FloatLength) return;
 				activeTime = property.floatValues[TimeIndex];
+				SkinnerRuntimeEditorUtility.DeepRecordObject(rootGameObject);
 				animationClip.SampleAnimation(rootGameObject, activeTime);
 			}
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicMaterial.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicMaterial.cs
@@ -40,6 +40,7 @@ public void SetValues(SkinLogicProperty property)
 				{
 					material = property.objectReferenceValues[MaterialIndex] as Material;
 				}
+				SkinnerRuntimeEditorUtility.RecordObject(graphic);
 				graphic.material = material;
 				SkinnerUtility.ReloadGameObject(graphic);
 			}

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/ImageSprite.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/ImageSprite.cs
@@ -40,6 +40,7 @@ public void SetValues(SkinLogicProperty property)
 				{
 					sprite = property.objectReferenceValues[SpriteIndex] as Sprite;
 				}
+				SkinnerRuntimeEditorUtility.RecordObject(image);
 				image.sprite = sprite;
 				SkinnerUtility.ReloadGameObject(image);
 			}

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/RawImageTexture.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/RawImageTexture.cs
@@ -39,6 +39,7 @@ public void SetValues(SkinLogicProperty property)
 				{
 					texture2D = property.objectReferenceValues[Texture2DIndex] as Texture2D;
 				}
+				SkinnerRuntimeEditorUtility.RecordObject(rawImage);
 				rawImage.texture = texture2D;
 				SkinnerUtility.ReloadGameObject(rawImage);
 			}

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/ScriptableLogic.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/ScriptableLogic.cs
@@ -46,6 +46,7 @@ public void SetValues(SkinLogicProperty property)
 				// 自由に処理をかけるのでエラー回避を入れておく
 				try
 				{
+					SkinnerRuntimeEditorUtility.RecordObjects(ignoredLogicProperty.Value.objectReferenceValues);
 					userLogic.SetValues(ignoredLogicProperty.Value);
 				}
 				// エラーが起こっても何もせず終わる

diff --git a/Packages/uGUI-Skinner/Runtime/SkinnerRuntimeEditorUtility.cs b/Packages/uGUI-Skinner/Runtime/SkinnerRuntimeEditorUtility.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using System.Collections.Generic;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -9,7 +10,7 @@ namespace Pspkurara.UI.Skinner
 	/// <summary>
 	/// ランタイム用asmdef上でエディタ関数を使うためのクラス
 	/// </summary>
-	internal static class SkinnerRuntimeEditorUtility
+	public static class SkinnerRuntimeEditorUtility
 	{
 
 		/// <summary>
@@ -19,11 +20,64 @@ internal static class SkinnerRuntimeEditorUtility
 		[System.Diagnostics.Conditional("UNITY_EDITOR")]
 		public static void RecordObject(Object @object)
 		{
+			if (@object == null) return;
 			#if UNITY_EDITOR
 			Undo.RecordObject(@object, "SkinnerPartsEdit");
 			#endif
 		}
 
+		/// <summary>
+		/// <seealso cref="Undo.RecordObject(Object, string)"/>を呼び出す
+		/// </summary>
+		/// <param name="objects">履歴を記録する対象のオブジェクト群</param>
+		[System.Diagnostics.Conditional("UNITY_EDITOR")]
+		public static void RecordObjects(IEnumerable<Object> objects)
+		{
+			foreach (var @object in objects)
+			{
+				RecordObject(@object);
+			}
+		}
+
+		/// <summary>
+		/// <seealso cref="Undo.RecordObject(Object, string)"/>を呼び出す
+		/// 全ての子に対して適応する
+		/// </summary>
+		/// <param name="object">履歴を記録する対象のオブジェクト</param>
+		[System.Diagnostics.Conditional("UNITY_EDITOR")]
+		public static void DeepRecordObject(GameObject rootGameObject)
+		{
+			// ルートがなければ何もしない
+			if (rootGameObject == null) return;
+
+			// 全てのコンポーネントのUndoを書き込む
+			foreach (var component in rootGameObject.GetComponentsInChildren<Component>(true))
+			{
+				RecordObject(component);
+			}
+
+			// 全てのtransformとgameObjectのUndoを書き込む
+			DeepRecordObjectWithTransformAndGameObject(rootGameObject.transform);
+		}
+
+		/// <summary>
+		/// <see cref="Transform"/>と<see cref="GameObject">に対して<seealso cref="Undo.RecordObject(Object, string)"/>を呼び出す
+		/// 全ての子に適応する
+		/// </summary>
+		/// <param name="transform">親オブジェクト</param>
+		[System.Diagnostics.Conditional("UNITY_EDITOR")]
+		private static void DeepRecordObjectWithTransformAndGameObject(Transform transform)
+		{
+			if (transform == null) return;
+			RecordObject(transform);
+			RecordObject(transform.gameObject);
+			for (int i = 0; i < transform.childCount; i++)
+			{
+				var child = transform.GetChild(i);
+				DeepRecordObjectWithTransformAndGameObject(child);
+			}
+		}
+
 	}
 
 }