feat: SkinPartsAttribute ルートタイプの指定を不要にした

pspkurara · Sep 9, 2020 · b7226c3 · b7226c3
1 parent 4cc0254
commit b7226c3
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 25 deletions.
diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/AnimationSample.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/AnimationSample.cs
@@ -3,7 +3,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.AnimationSample, typeof(AnimationSample), typeof(Logic))]
+	[SkinParts(SkinPartsType.AnimationSample, typeof(Logic))]
 	public static class AnimationSample
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/BaseMeshEffectEnable.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/BaseMeshEffectEnable.cs
@@ -6,7 +6,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.BaseMeshEffectEnable, typeof(BaseMeshEffectEnable), typeof(Logic))]
+	[SkinParts(SkinPartsType.BaseMeshEffectEnable, typeof(Logic))]
 	public static class BaseMeshEffectEnable
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/CanvasGroupAlpha.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/CanvasGroupAlpha.cs
@@ -5,7 +5,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.CanvasGroupAlpha, typeof(CanvasGroupAlpha), typeof(Logic))]
+	[SkinParts(SkinPartsType.CanvasGroupAlpha, typeof(Logic))]
 	public static class CanvasGroupAlpha
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicColor.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicColor.cs
@@ -6,7 +6,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.GraphicColor, typeof(GraphicColor), typeof(Logic))]
+	[SkinParts(SkinPartsType.GraphicColor, typeof(Logic))]
 
 	public static class GraphicColor
 	{

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicEnable.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicEnable.cs
@@ -6,7 +6,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.GraphicEnable, typeof(GraphicEnable), typeof(Logic))]
+	[SkinParts(SkinPartsType.GraphicEnable, typeof(Logic))]
 	public static class GraphicEnable
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicMaterial.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/GraphicMaterial.cs
@@ -5,7 +5,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.GraphicMaterial, typeof(GraphicMaterial), typeof(Logic))]
+	[SkinParts(SkinPartsType.GraphicMaterial, typeof(Logic))]
 	public static class GraphicMaterial
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/ImageSprite.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/ImageSprite.cs
@@ -5,7 +5,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.ImageSprite, typeof(ImageSprite), typeof(Logic))]
+	[SkinParts(SkinPartsType.ImageSprite, typeof(Logic))]
 	public static class ImageSprite
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/ObjectSetActives.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/ObjectSetActives.cs
@@ -6,7 +6,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.ObjectsSetActives, typeof(ObjectSetActives), typeof(Logic))]
+	[SkinParts(SkinPartsType.ObjectsSetActives, typeof(Logic))]
 	public static class ObjectSetActives
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/OutlineColor.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/OutlineColor.cs
@@ -6,7 +6,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.OutlineColor, typeof(OutlineColor), typeof(Logic))]
+	[SkinParts(SkinPartsType.OutlineColor, typeof(Logic))]
 	public static class OutlineColor
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/RawImageTexture.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/RawImageTexture.cs
@@ -4,7 +4,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.RawImageTexture, typeof(RawImageTexture), typeof(Logic))]
+	[SkinParts(SkinPartsType.RawImageTexture, typeof(Logic))]
 	public static class RawImageTexture
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/ScriptableLogic.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/ScriptableLogic.cs
@@ -7,7 +7,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.ScriptableLogic, typeof(ScriptableLogic), typeof(Logic))]
+	[SkinParts(SkinPartsType.ScriptableLogic, typeof(Logic))]
 	public static class ScriptableLogic
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/ShadowColor.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/ShadowColor.cs
@@ -6,7 +6,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.ShadowColor, typeof(ShadowColor), typeof(Logic))]
+	[SkinParts(SkinPartsType.ShadowColor, typeof(Logic))]
 	public static class ShadowColor
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/TransformRotation.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/TransformRotation.cs
@@ -5,7 +5,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.TransformRotation, typeof(TransformRotation), typeof(Logic))]
+	[SkinParts(SkinPartsType.TransformRotation, typeof(Logic))]
 	public static class TransformRotation
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinParts/TransformScale.cs b/Packages/uGUI-Skinner/Runtime/SkinParts/TransformScale.cs
@@ -5,7 +5,7 @@
 namespace Pspkurara.UI.Skinner
 {
 
-	[SkinParts(SkinPartsType.TransformScale, typeof(TransformScale), typeof(Logic))]
+	[SkinParts(SkinPartsType.TransformScale, typeof(Logic))]
 	public static class TransformScale
 	{
 

diff --git a/Packages/uGUI-Skinner/Runtime/SkinPartsAccess.cs b/Packages/uGUI-Skinner/Runtime/SkinPartsAccess.cs
@@ -16,8 +16,11 @@ internal static class SkinPartsAccess
 
 		/// <summary>
 		/// スキンパーツのIDとクラスを紐付ける一覧
+		/// キー: スキンパーツID ( <see cref="SkinPartsType"/>が使われる )
+		/// 値 (キー) : 親の型 ( ルートタイプ )
+		/// 値 (値) : ルートタイプのクラスに紐付けられた<see cref="SkinPartsAttribute"/>属性
 		/// </summary>
-		private static readonly Dictionary<int, SkinPartsAttribute> m_SkinParts = CreateSkinPartsList();
+		private static readonly Dictionary<int, KeyValuePair<Type, SkinPartsAttribute>> m_SkinParts = CreateSkinPartsList();
 
 		/// <summary>
 		/// スキンパーツIDがおかしいときに返すダミー処理
@@ -31,12 +34,12 @@ internal static class SkinPartsAccess
 		/// <summary>
 		/// 該当属性を持つスキンパーツクラスを全取得してリストアップ
 		/// </summary>
-		private static Dictionary<int, SkinPartsAttribute> CreateSkinPartsList()
+		private static Dictionary<int, KeyValuePair<Type, SkinPartsAttribute>> CreateSkinPartsList()
 		{
 			return typeof(SkinPartsAccess).Assembly.GetTypes()
 				.Where(t => t.GetCustomAttribute<SkinPartsAttribute>() != null)
-				.Select(t => t.GetCustomAttribute<SkinPartsAttribute>())
-				.ToDictionary(a => a.Id, a => a);
+				.Select(t => new KeyValuePair<Type, SkinPartsAttribute>(t, t.GetCustomAttribute<SkinPartsAttribute>()))
+				.ToDictionary(a => a.Value.Id, a => a);
 		}
 
 		/// <summary>
@@ -51,7 +54,7 @@ public static ISkinLogic CreateSkinLogicInstance(int id)
 			{
 				return m_DoNothingLogic;
 			}
-			return (ISkinLogic)Activator.CreateInstance(m_SkinParts[id].LogicType);
+			return (ISkinLogic)Activator.CreateInstance(m_SkinParts[id].Value.LogicType);
 		}
 
 		/// <summary>
@@ -70,7 +73,7 @@ public static int[] GetAllSkinPartsIds()
 		/// <returns>スキンパーツクラスの型</returns>
 		public static Type GetSkinPartsRootType(int id)
 		{
-			return m_SkinParts[id].RootType;
+			return m_SkinParts[id].Key;
 		}
 
 		/// <summary>

diff --git a/Packages/uGUI-Skinner/Runtime/SkinPartsAttribute.cs b/Packages/uGUI-Skinner/Runtime/SkinPartsAttribute.cs
@@ -7,19 +7,16 @@ namespace Pspkurara.UI.Skinner
 	public sealed class SkinPartsAttribute : Attribute
 	{
 
-		public SkinPartsAttribute(int id, Type rootType, Type logicType)
+		public SkinPartsAttribute(int id, Type logicType)
 		{
 			Id = id;
-			RootType = rootType;
 			LogicType = logicType;
 		}
 
-		public SkinPartsAttribute(SkinPartsType partsType, Type rootType, Type logicType) : this((int)partsType, rootType, logicType) { }
+		public SkinPartsAttribute(SkinPartsType partsType, Type logicType) : this((int)partsType, logicType) { }
 
 		public int Id;
 
-		public Type RootType;
-
 		public Type LogicType;
 
 	}