From 965e8f855373f400cd3f91f7b0d2828d6b91309d Mon Sep 17 00:00:00 2001 From: REDCODE Date: Sat, 13 Jun 2026 21:23:15 +0200 Subject: [PATCH] Renamed Dif to MorphVariant --- 2DGAMELIB/_2DGAMELIB/Difs.cs | 52 +++++++++---------- .../_2DGAMELIB/{Dif.cs => MorphVariant.cs} | 14 ++--- 2DGAMELIB/_2DGAMELIB/Ser.cs | 3 +- .../BodyPartClasses/BackHair0_カル.cs | 10 ++-- .../BodyPartClasses/BackHair0_ジグ.cs | 10 ++-- .../BodyPartClasses/BackHair0_ハネ.cs | 10 ++-- .../BodyPartClasses/BackHair0_パツ.cs | 10 ++-- .../BodyPartClasses/BackHair0_下1カル.cs | 10 ++-- .../BodyPartClasses/BackHair0_下1ジグ.cs | 10 ++-- .../BodyPartClasses/BackHair0_下1ハネ.cs | 10 ++-- .../BodyPartClasses/BackHair0_下1パツ.cs | 10 ++-- .../BodyPartClasses/BackHair0_下2カル.cs | 10 ++-- .../BodyPartClasses/BackHair0_下2ジグ.cs | 10 ++-- .../BodyPartClasses/BackHair0_下2ハネ.cs | 10 ++-- .../BodyPartClasses/BackHair0_下2パツ.cs | 10 ++-- .../BodyPartClasses/BackHair0_編1カル.cs | 10 ++-- .../BodyPartClasses/BackHair0_編1ジグ.cs | 10 ++-- .../BodyPartClasses/BackHair0_編1ハネ.cs | 10 ++-- .../BodyPartClasses/BackHair0_編1パツ.cs | 10 ++-- .../BodyPartClasses/BackHair0_編2カル.cs | 10 ++-- .../BodyPartClasses/BackHair0_編2ジグ.cs | 10 ++-- .../BodyPartClasses/BackHair0_編2ハネ.cs | 10 ++-- .../BodyPartClasses/BackHair0_編2パツ.cs | 10 ++-- .../BodyPartClasses/BackHair0_肢系.cs | 10 ++-- .../BodyPartClasses/BackHair1_結1カル.cs | 10 ++-- .../BodyPartClasses/BackHair1_結1ジグ.cs | 10 ++-- .../BodyPartClasses/BackHair1_結1ハネ.cs | 10 ++-- .../BodyPartClasses/BackHair1_結1パツ.cs | 10 ++-- .../BodyPartClasses/BackHair1_結2カル.cs | 10 ++-- .../BodyPartClasses/BackHair1_結2ジグ.cs | 10 ++-- .../BodyPartClasses/BackHair1_結2ハネ.cs | 10 ++-- .../BodyPartClasses/BackHair1_結2パツ.cs | 10 ++-- .../BodyPartClasses/BackHair1_編結.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/Leg_獣.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/Leg_竜.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/Leg_蹄.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/Leg_鳥.cs | 6 +-- .../BodyPartClasses/LowerArm_獣.cs | 6 +-- .../BodyPartClasses/LowerArm_蹄.cs | 6 +-- .../BodyPartClasses/SideHair_カル.cs | 10 ++-- .../BodyPartClasses/SideHair_ジグ.cs | 10 ++-- .../BodyPartClasses/SideHair_ハネ.cs | 10 ++-- .../BodyPartClasses/SideHair_パツ.cs | 10 ++-- .../BodyPartClasses/SideHair_編み.cs | 10 ++-- .../BodyPartClasses/SideHair_肢系.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/Torso_蛇.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/Torso_蟲.cs | 10 ++-- .../BodyPartClasses/UpperArm_獣.cs | 6 +-- .../BodyPartClasses/UpperArm_蹄.cs | 6 +-- .../BodyPartClasses/ぶっかけ_大.cs | 6 +-- .../BodyPartClasses/ぶっかけ_小.cs | 6 +-- .../BodyPartClasses/上着トップ_ドレス.cs | 6 +-- .../BodyPartClasses/上着ボトム_クロス.cs | 6 +-- .../BodyPartClasses/上着ボトム_前掛け.cs | 6 +-- .../BodyPartClasses/上着ミドル_ドレス.cs | 6 +-- .../BodyPartClasses/下着トップ_クロス.cs | 6 +-- .../BodyPartClasses/下着トップ_チューブ.cs | 6 +-- .../BodyPartClasses/下着トップ_ビキニ.cs | 6 +-- .../BodyPartClasses/下着トップ_ブラ.cs | 6 +-- .../BodyPartClasses/下着トップ_マイクロ.cs | 6 +-- .../BodyPartClasses/下着ボトム_ノーマル.cs | 6 +-- .../BodyPartClasses/下着ボトム_マイクロ.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/前翅_甲.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/前翅_羽.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/前翅_草.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/前翅_蝶.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/前髪_ジグ.cs | 10 ++-- .../BodyPartClasses/前髪_ジグ中寄.cs | 10 ++-- .../BodyPartClasses/前髪_ジグ分け.cs | 10 ++-- .../BodyPartClasses/前髪_パッツン.cs | 10 ++-- .../BodyPartClasses/前髪_モジャ.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/前髪_三分1.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/前髪_三分2.cs | 10 ++-- .../BodyPartClasses/前髪_上げ片.cs | 10 ++-- .../BodyPartClasses/前髪_上げ短1.cs | 10 ++-- .../BodyPartClasses/前髪_上げ短2.cs | 10 ++-- .../BodyPartClasses/前髪_上げ長1.cs | 10 ++-- .../BodyPartClasses/前髪_上げ長2.cs | 10 ++-- .../BodyPartClasses/前髪_中分け1.cs | 10 ++-- .../BodyPartClasses/前髪_中分け2.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/前髪_二分1.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/前髪_二分2.cs | 10 ++-- .../BodyPartClasses/前髪_横流し.cs | 10 ++-- .../BodyPartClasses/前髪_目隠れ1.cs | 10 ++-- .../BodyPartClasses/前髪_目隠れ2.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/単足_植.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/単足_粘.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/口_裂け.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/口_通常.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/多足_蛸.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/多足_蜘.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/多足_蠍.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/大顎.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/尾_ウ.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_ガ.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_ヘ.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_悪.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_根.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_淫.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_牛.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_犬.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_狐.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_猫.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_短.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_竜.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_腓.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_虫.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_蛇.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_蜘.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_蟲.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_蠍.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_馬.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_魚.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_鯨.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_鳥.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾_龍.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/尾鰭_魚.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/後翅_甲.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/後翅_羽.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/後翅_草.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/後翅_蝶.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/手_牛.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/手_獣.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/手_馬.cs | 10 ++-- SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/潮吹_大_人.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/潮吹_小_人.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/節尾_曳航.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/節尾_鋏.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/節足_足百.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/節足_足蜘.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/節足_足蠍.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/耳_人.cs | 4 +- .../SlaveMatrix/BodyPartClasses/耳_尖.cs | 4 +- .../SlaveMatrix/BodyPartClasses/耳_獣.cs | 4 +- .../SlaveMatrix/BodyPartClasses/耳_羽.cs | 4 +- .../SlaveMatrix/BodyPartClasses/耳_長.cs | 4 +- .../SlaveMatrix/BodyPartClasses/耳_鰭.cs | 4 +- .../SlaveMatrix/BodyPartClasses/背中_光.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/背中_甲.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/背中_羽.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/腿_獣.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/腿_竜.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/腿_蹄.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/腿_鳥.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/舌_短.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/舌_長.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/花_百.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/花_薔.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/葉_心.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/葉_披.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/虫顎.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角1_一.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角1_虫.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角1_鬼.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_山1.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_山2.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_山3.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_巻.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_牛1.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_牛2.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_牛3.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_牛4.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_虫.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/角2_鬼.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/触手_犬.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触手_蔦.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触手_触.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触手_軟.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触覚_甲.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触覚_節.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触覚_線.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触覚_蛾.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触覚_蝶.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/触覚_蠍.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/足_牛.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/足_獣.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/足_竜.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/足_馬.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/足_鳥.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/長物_蛇.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/長物_蟲.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/長物_魚.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/長物_鯨.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/頭頂_天.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/頭頂_宇.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/頭頂_皿.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/頭頂後_宇.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/顔面_甲.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/顔面_虫.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/顔面_蟲.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/鰭_豚.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/鰭_魚.cs | 6 +-- .../SlaveMatrix/BodyPartClasses/鰭_鯨.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/鳳凰.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/鼻_人.cs | 10 ++-- .../SlaveMatrix/BodyPartClasses/鼻_獣.cs | 10 ++-- 202 files changed, 890 insertions(+), 889 deletions(-) rename 2DGAMELIB/_2DGAMELIB/{Dif.cs => MorphVariant.cs} (93%) diff --git a/2DGAMELIB/_2DGAMELIB/Difs.cs b/2DGAMELIB/_2DGAMELIB/Difs.cs index 9b8cafa..a1a2bb4 100644 --- a/2DGAMELIB/_2DGAMELIB/Difs.cs +++ b/2DGAMELIB/_2DGAMELIB/Difs.cs @@ -15,7 +15,7 @@ namespace _2DGAMELIB public double ValueY; - private List difs = new List(); + private List difs = new List(); public Dictionary pj; @@ -67,7 +67,7 @@ namespace _2DGAMELIB } } - public Dif this[int Index] + public MorphVariant this[int Index] { get { @@ -85,7 +85,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.PositionSize = value; } @@ -96,7 +96,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.PositionVector = value; } @@ -107,7 +107,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.AngleBase = value; } @@ -118,7 +118,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.AngleCont = value; } @@ -129,7 +129,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.SizeBase = value; } @@ -140,7 +140,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.SizeCont = value; } @@ -151,7 +151,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.SizeXBase = value; } @@ -162,7 +162,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.SizeXCont = value; } @@ -173,7 +173,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.SizeYBase = value; } @@ -184,7 +184,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.SizeYCont = value; } @@ -195,7 +195,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.Dra = value; } @@ -206,7 +206,7 @@ namespace _2DGAMELIB { set { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.Hit = value; } @@ -231,7 +231,7 @@ namespace _2DGAMELIB public IEnumerable EnumJoinRoot => pr.Values; public IEnumerable EnumAllPar() { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { foreach (ShapePart item in dif.EnumAllPar()) { @@ -242,7 +242,7 @@ namespace _2DGAMELIB public IEnumerable EnumAllPars() { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { foreach (PartGroup item in dif.Parss) { @@ -253,7 +253,7 @@ namespace _2DGAMELIB public void SetDefault() { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.SetDefault(); } @@ -273,15 +273,15 @@ namespace _2DGAMELIB Tag = Difs.Tag; ValueX = Difs.ValueX; ValueY = Difs.ValueY; - foreach (Dif dif in Difs.difs) + foreach (MorphVariant dif in Difs.difs) { - difs.Add(new Dif(dif)); + difs.Add(new MorphVariant(dif)); } } - public void Add(Dif Dif) + public void Add(MorphVariant MorphVariant) { - difs.Add(Dif); + difs.Add(MorphVariant); } @@ -361,12 +361,12 @@ namespace _2DGAMELIB public ShapePart GetHitPar_(Color HitColor) { - return difs.FirstOrDefault((Dif d) => d.IsHit(ref HitColor)).Parss.FirstOrDefault((PartGroup ps) => ps.IsHit(ref HitColor)).EnumAllPar().FirstOrDefault((ShapePart e) => e.HitColor == HitColor); + return difs.FirstOrDefault((MorphVariant d) => d.IsHit(ref HitColor)).Parss.FirstOrDefault((PartGroup ps) => ps.IsHit(ref HitColor)).EnumAllPar().FirstOrDefault((ShapePart e) => e.HitColor == HitColor); } public bool IsHit(ref Color HitColor) { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { if (dif.IsHit(ref HitColor)) { @@ -379,7 +379,7 @@ namespace _2DGAMELIB public void ReverseX() { SetJoints(); - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.ReverseX(); } @@ -389,7 +389,7 @@ namespace _2DGAMELIB public void ReverseY() { SetJoints(); - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.ReverseY(); } @@ -398,7 +398,7 @@ namespace _2DGAMELIB public void Dispose() { - foreach (Dif dif in difs) + foreach (MorphVariant dif in difs) { dif.Dispose(); } diff --git a/2DGAMELIB/_2DGAMELIB/Dif.cs b/2DGAMELIB/_2DGAMELIB/MorphVariant.cs similarity index 93% rename from 2DGAMELIB/_2DGAMELIB/Dif.cs rename to 2DGAMELIB/_2DGAMELIB/MorphVariant.cs index f30abe7..8ca479c 100644 --- a/2DGAMELIB/_2DGAMELIB/Dif.cs +++ b/2DGAMELIB/_2DGAMELIB/MorphVariant.cs @@ -5,7 +5,7 @@ using System.Drawing; namespace _2DGAMELIB { [Serializable] - public class Dif + public class MorphVariant { public string Tag = ""; @@ -178,19 +178,19 @@ namespace _2DGAMELIB } } - public Dif() + public MorphVariant() { } - public Dif(Dif Dif) + public MorphVariant(MorphVariant MorphVariant) { - Copy(Dif); + Copy(MorphVariant); } - private void Copy(Dif Dif) + private void Copy(MorphVariant MorphVariant) { - Tag = Dif.Tag; - foreach (PartGroup item in Dif.parss) + Tag = MorphVariant.Tag; + foreach (PartGroup item in MorphVariant.parss) { parss.Add(new PartGroup(item)); } diff --git a/2DGAMELIB/_2DGAMELIB/Ser.cs b/2DGAMELIB/_2DGAMELIB/Ser.cs index 49fd6eb..ed8ee95 100644 --- a/2DGAMELIB/_2DGAMELIB/Ser.cs +++ b/2DGAMELIB/_2DGAMELIB/Ser.cs @@ -19,7 +19,8 @@ namespace _2DGAMELIB .Add("_2DGAMELIB.ParT", typeof(ShapePartT)) .Add("_2DGAMELIB.Pars", typeof(PartGroup)) .Add("_2DGAMELIB.Out", typeof(CurveOutline)) - .Add("_2DGAMELIB.Joi", typeof(JointPoint)); + .Add("_2DGAMELIB.Joi", typeof(JointPoint)) + .Add("_2DGAMELIB.Dif", typeof(MorphVariant)); private static BinaryFormatter NewFormatter() { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs index 0fa8123..220c869 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs @@ -381,12 +381,12 @@ namespace SlaveMatrix public BackHair0_カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "カル"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "カル"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪中 = partGroup["髪中"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs index 96f8da4..f86db8d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs @@ -381,12 +381,12 @@ namespace SlaveMatrix public BackHair0_ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ジグ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪中 = partGroup["髪中"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs index 231dd44..7cee3d3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs @@ -381,12 +381,12 @@ namespace SlaveMatrix public 後髪0_ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ハネ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪中 = partGroup["髪中"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs index 64fa376..6447893 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs @@ -381,12 +381,12 @@ namespace SlaveMatrix public BackHair0_パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "パツ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪中 = partGroup["髪中"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs index 7d15cda..7207e91 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs @@ -304,12 +304,12 @@ namespace SlaveMatrix public BackHair0_下1カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ1カル"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][7])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ1カル"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][7])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs index be2e7fc..471305d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs @@ -304,12 +304,12 @@ namespace SlaveMatrix public 後髪0_下1ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ1ジグ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][4])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ1ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][4])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs index e38ddbf..c8ea3ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs @@ -304,12 +304,12 @@ namespace SlaveMatrix public BackHair0_下1ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ1ハネ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][5])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ1ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][5])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs index dedd7f8..55ee7a7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs @@ -304,12 +304,12 @@ namespace SlaveMatrix public BackHair0_下1パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ1パツ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][6])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ1パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][6])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs index 817680e..ca5d2b8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs @@ -348,12 +348,12 @@ namespace SlaveMatrix public BackHair0_下2カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下2カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ2カル"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][11])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ2カル"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][11])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs index 3b6e784..8930d82 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs @@ -348,12 +348,12 @@ namespace SlaveMatrix public BackHair0_下2ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下2ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ2ジグ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][8])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ2ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][8])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs index 9c8ef9c..81fdb3e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs @@ -348,12 +348,12 @@ namespace SlaveMatrix public BackHair0_下2ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_下2ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ2ハネ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][9])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ2ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][9])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs index f8f9735..a6bab52 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs @@ -348,12 +348,12 @@ namespace SlaveMatrix public BackHair0_下2パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下2パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "下げ2パツ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][10])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "下げ2パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][10])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs index abd8dcd..4b9ab2f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs @@ -601,12 +601,12 @@ namespace SlaveMatrix public BackHair0_編1カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_編1カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み1カル"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][15])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み1カル"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][15])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs index a5b430b..35949c7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs @@ -601,12 +601,12 @@ namespace SlaveMatrix public BackHair0_編1ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編1ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み1ジグ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][12])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み1ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][12])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs index 2f8f819..353ec3b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs @@ -601,12 +601,12 @@ namespace SlaveMatrix public BackHair0_編1ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編1ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み1ハネ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][13])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み1ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][13])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs index 377726c..334edb6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs @@ -601,12 +601,12 @@ namespace SlaveMatrix public 後髪0_編1パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_編1パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み1パツ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][14])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み1パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][14])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs index 3a8842e..b93a013 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs @@ -1084,12 +1084,12 @@ namespace SlaveMatrix public 後髪0_編2カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み2カル"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][19])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み2カル"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][19])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs index d1179a0..5407cdc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs @@ -1084,12 +1084,12 @@ namespace SlaveMatrix public BackHair0_編2ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み2ジグ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][16])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み2ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][16])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs index 9b32d55..1a18fe5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs @@ -1084,12 +1084,12 @@ namespace SlaveMatrix public BackHair0_編2ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み2ハネ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][17])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み2ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][17])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs index 8e163de..ec9d652 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs @@ -1084,12 +1084,12 @@ namespace SlaveMatrix public BackHair0_編2パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み2パツ"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][18])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み2パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][18])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs index f873467..e5f1c9d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs @@ -142,12 +142,12 @@ namespace SlaveMatrix { BackHair0_肢系 後髪0_肢系2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "肢系"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][21])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "肢系"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][21])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs index d3987e4..397fe82 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs @@ -284,12 +284,12 @@ namespace SlaveMatrix public BackHair1_結1カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い1カル"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い1カル"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs index 055c5af..3a10237 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs @@ -284,12 +284,12 @@ namespace SlaveMatrix public BackHair1_結1ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い1ジグ"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い1ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs index e1c273d..de16800 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs @@ -284,12 +284,12 @@ namespace SlaveMatrix public BackHair1_結1ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い1ハネ"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い1ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs index 4ec7af6..fcd7ae9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs @@ -284,12 +284,12 @@ namespace SlaveMatrix public BackHair1_結1パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い1パツ"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い1パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs index 1040cfe..163aa22 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs @@ -261,12 +261,12 @@ namespace SlaveMatrix public BackHair1_結2カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い2カル"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][7])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い2カル"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][7])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs index cc7b888..d883df7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs @@ -261,12 +261,12 @@ namespace SlaveMatrix public BackHair1_結2ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い2ジグ"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][4])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い2ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][4])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs index c2393dd..7dfc03b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs @@ -261,12 +261,12 @@ namespace SlaveMatrix public BackHair1_結2ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い2ハネ"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][5])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い2ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][5])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs index 24e9567..c176e97 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs @@ -261,12 +261,12 @@ namespace SlaveMatrix public BackHair1_結2パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "結い2パツ"; - dif.Add(new PartGroup(Sta.胴体["BackHair1"][0][6])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "結い2パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][6])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs index 1458516..bd88c15 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs @@ -411,12 +411,12 @@ namespace SlaveMatrix public BackHair1_編結(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_編結D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編結"; - dif.Add(new PartGroup(Sta.胴体["BackHair0"][0][20])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編結"; + morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][20])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); PartGroup pars2 = partGroup["お下げ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs index f0f4003..5b08547 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs @@ -275,10 +275,10 @@ namespace SlaveMatrix { Leg_獣 Leg_獣2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足脚"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_Leg = partGroup["脚"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs index 019a434..8ed1e6e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs @@ -653,10 +653,10 @@ namespace SlaveMatrix { Leg_竜 Leg_竜2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足脚"][3]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][3]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_Leg = partGroup["脚"].ToPar(); PartGroup pars2 = partGroup["鱗脹"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs index b557c9a..259f31e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs @@ -275,10 +275,10 @@ namespace SlaveMatrix { Leg_蹄 Leg_蹄2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足脚"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_Leg = partGroup["脚"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs index 8efcae5..bff6912 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs @@ -275,10 +275,10 @@ namespace SlaveMatrix { Leg_鳥 Leg_鳥2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足脚"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_Leg = partGroup["脚"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs index e5b25c7..415e2a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs @@ -456,10 +456,10 @@ namespace SlaveMatrix { LowerArm_獣 LowerArm_獣2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.腕左["四足LowerArm"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足LowerArm"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_LowerArm = partGroup["下腕"].ToPar(); PartGroup pars2 = partGroup["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs index 7a3ffbd..0ecb462 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs @@ -146,10 +146,10 @@ namespace SlaveMatrix { LowerArm_蹄 LowerArm_蹄2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.腕左["四足LowerArm"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足LowerArm"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_LowerArm = partGroup["下腕"].ToPar(); PartGroup pars2 = partGroup["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs index b0bceba..9ee72dc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs @@ -144,12 +144,12 @@ namespace SlaveMatrix public SideHair_カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_カルD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "カル"; - dif.Add(new PartGroup(Sta.胴体["横髪左"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "カル"; + morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪1 = partGroup["髪1"].ToPar(); X0Y0_髪2 = partGroup["髪2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs index 98ba3b3..2eeb88a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs @@ -144,12 +144,12 @@ namespace SlaveMatrix public SideHair_ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ジグ"; - dif.Add(new PartGroup(Sta.胴体["横髪左"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪1 = partGroup["髪1"].ToPar(); X0Y0_髪2 = partGroup["髪2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs index a9340c2..721f6f5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs @@ -144,12 +144,12 @@ namespace SlaveMatrix public SideHair_ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_ハネD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ハネ"; - dif.Add(new PartGroup(Sta.胴体["横髪左"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ハネ"; + morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪1 = partGroup["髪1"].ToPar(); X0Y0_髪2 = partGroup["髪2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs index 2a5c5ae..b7d7e10 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs @@ -144,12 +144,12 @@ namespace SlaveMatrix public SideHair_パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_パツD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "パツ"; - dif.Add(new PartGroup(Sta.胴体["横髪左"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "パツ"; + morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪1 = partGroup["髪1"].ToPar(); X0Y0_髪2 = partGroup["髪2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs index ea849fa..3b19ade 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs @@ -417,12 +417,12 @@ namespace SlaveMatrix public SideHair_編み(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_編みD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "編み"; - dif.Add(new PartGroup(Sta.胴体["横髪左"][0][4])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "編み"; + morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][4])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪 = partGroup["髪"].ToPar(); PartGroup pars2 = partGroup["編節1"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs index 8c26267..811ad24 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs @@ -92,12 +92,12 @@ namespace SlaveMatrix { SideHair_肢系 横髪_肢系2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "肢系"; - dif.Add(new PartGroup(Sta.胴体["横髪左"][0][5])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "肢系"; + morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][5])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪 = partGroup["髪"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs index 0ad334b..8d2d9b5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs @@ -334,12 +334,12 @@ namespace SlaveMatrix partGroup.Tag = "蛇"; partGroup.Add(new PartGroup(Sta.半身["長物"][0][2]["胴2"].ToPars())); partGroup.Add(new PartGroup(Sta.半身["長物"][0][2]["輪1"].ToPars())); - Dif dif = new Dif(); - dif.Tag = partGroup.Tag; - dif.Add(partGroup); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = partGroup.Tag; + morphVariant.Add(partGroup); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; PartGroup pars3 = pars2["胴2"].ToPars(); X0Y0_Torso_鱗 = pars3["鱗"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs index 2c5a255..c41a629 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs @@ -481,12 +481,12 @@ namespace SlaveMatrix partGroup.Tag = "蟲"; partGroup.Add(new PartGroup(Sta.半身["長物"][0][3]["胴4"].ToPars())); partGroup.Add(new PartGroup(Sta.半身["長物"][0][3]["輪2"].ToPars())); - Dif dif = new Dif(); - dif.Tag = partGroup.Tag; - dif.Add(partGroup); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = partGroup.Tag; + morphVariant.Add(partGroup); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; PartGroup pars3 = pars2["胴4"].ToPars(); X0Y0_Torso_背板 = pars3["背板"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs index 72a7799..389ab47 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs @@ -272,10 +272,10 @@ namespace SlaveMatrix { UpperArm_獣 UpperArm_獣2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.腕左["四足UpperArm"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足UpperArm"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_筋肉上 = partGroup["筋肉上"].ToPar(); X0Y0_UpperArm = partGroup["上腕"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs index d981918..7db521e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs @@ -146,10 +146,10 @@ namespace SlaveMatrix { UpperArm_蹄 UpperArm_蹄2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.腕左["四足UpperArm"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足UpperArm"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_筋肉上 = partGroup["筋肉上"].ToPar(); X0Y0_UpperArm = partGroup["上腕"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs index 1d8340d..e8b8f9c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs @@ -110,10 +110,10 @@ namespace SlaveMatrix public ぶっかけ_大(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ぶっかけ_大D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.スタンプ["ぶっかけ"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.スタンプ["ぶっかけ"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs index 05d1ea5..a27c53b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs @@ -110,10 +110,10 @@ namespace SlaveMatrix public ぶっかけ_小(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ぶっかけ_小D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.スタンプ["ぶっかけ"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.スタンプ["ぶっかけ"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs index 57052a5..cd6d994 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs @@ -697,10 +697,10 @@ namespace SlaveMatrix public 上着トップ_ドレス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着トップ_ドレスD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["上着トップ"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着トップ"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_服基 = partGroup["服基"].ToPar(); PartGroup pars2 = partGroup["紐"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs index c771dda..f734f25 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs @@ -646,10 +646,10 @@ namespace SlaveMatrix { 上着ボトム_クロス 上着ボトム_クロス2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["上着ボトム前"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ボトム前"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["中"].ToPars(); X0Y0_中_下地 = pars2["下地"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs index b2cda31..be722c9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs @@ -372,10 +372,10 @@ namespace SlaveMatrix public 上着ボトム_前掛け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ボトム_前掛けD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["上着ボトム前"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ボトム前"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_帯 = partGroup["帯"].ToPar(); X0Y0_巻 = partGroup["巻"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs index a286d3a..cb6122d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs @@ -324,10 +324,10 @@ namespace SlaveMatrix public 上着ミドル_ドレス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ミドル_ドレスD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["上着ミドル"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ミドル"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_服 = partGroup["服"].ToPar(); PartGroup pars2 = partGroup["縁"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs index 3a09b7a..997ec43 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs @@ -591,10 +591,10 @@ namespace SlaveMatrix public 下着トップ_クロス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_クロスD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["下着トップ"][4]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][4]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["布"].ToPars(); PartGroup pars3 = pars2["布左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs index e83f46b..bfb462c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs @@ -535,10 +535,10 @@ namespace SlaveMatrix public 下着トップ_チューブ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_チューブD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["下着トップ"][3]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][3]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["布"].ToPars(); PartGroup pars3 = pars2["布左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs index d59415c..826e4e8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs @@ -447,10 +447,10 @@ namespace SlaveMatrix public 下着トップ_ビキニ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_ビキニD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["下着トップ"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_紐 = partGroup["紐"].ToPar(); PartGroup pars2 = partGroup["カップ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs index f8a8659..1864021 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs @@ -2302,10 +2302,10 @@ namespace SlaveMatrix public 下着トップ_ブラ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_ブラD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["下着トップ"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["バンド"].ToPars(); X0Y0_バンド_バンド = pars2["バンド"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs index 7e71020..d173302 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs @@ -447,10 +447,10 @@ namespace SlaveMatrix public 下着トップ_マイクロ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_マイクロD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["下着トップ"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_紐 = partGroup["紐"].ToPar(); PartGroup pars2 = partGroup["カップ左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs index 582bb78..c1cb327 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs @@ -2712,10 +2712,10 @@ namespace SlaveMatrix public 下着ボトム_ノーマル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着ボトム_ノーマルD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["下着ボトム"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着ボトム"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_紐左 = partGroup["紐左"].ToPar(); X0Y0_紐右 = partGroup["紐右"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs index 0f39cde..fc14b16 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs @@ -1787,10 +1787,10 @@ namespace SlaveMatrix public 下着ボトム_マイクロ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着ボトム_マイクロD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["下着ボトム"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着ボトム"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_紐左 = partGroup["紐左"].ToPar(); X0Y0_紐右 = partGroup["紐右"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs index 8a05bec..3b29904 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs @@ -713,10 +713,10 @@ namespace SlaveMatrix { 前翅_甲 前翅_甲2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["前翅"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["前翅"].ToPars(); PartGroup pars3 = pars2["前翅軸"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs index d92c53b..d7dcefa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs @@ -903,10 +903,10 @@ namespace SlaveMatrix public 前翅_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前翅_羽D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["前翅"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["前翅"].ToPars(); X0Y0_前翅_前翅 = partGroup["前翅"].ToPar(); X0Y0_前翅_翅脈1 = partGroup["翅脈1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs index bc0347b..d729809 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs @@ -401,10 +401,10 @@ namespace SlaveMatrix public 前翅_草(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前翅_草D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["前翅"][3]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][3]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["前翅"].ToPars(); X0Y0_前翅_前翅1 = partGroup["前翅1"].ToPar(); X0Y0_前翅_翅脈線1 = partGroup["翅脈線1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs index a2d3c6b..a070793 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs @@ -667,10 +667,10 @@ namespace SlaveMatrix public 前翅_蝶(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前翅_蝶D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["前翅"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["前翅"].ToPars(); X0Y0_前翅_前翅 = partGroup["前翅"].ToPar(); PartGroup pars2 = partGroup["水青"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs index 1a9d6f6..36bed53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs @@ -815,12 +815,12 @@ namespace SlaveMatrix public 前髪_ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_ジグD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ジグ"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ジグ"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪左1 = partGroup["髪左1"].ToPar(); X0Y0_髪左2 = partGroup["髪左2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs index 6e4e503..52d23a5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs @@ -815,12 +815,12 @@ namespace SlaveMatrix public 前髪_ジグ中寄(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_ジグ中寄D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ジグ中寄"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ジグ中寄"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪左1 = partGroup["髪左1"].ToPar(); X0Y0_髪左2 = partGroup["髪左2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs index 455cbfa..b2f4d24 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs @@ -815,12 +815,12 @@ namespace SlaveMatrix public 前髪_ジグ分け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_ジグ分けD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ジグ分け"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ジグ分け"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪左1 = partGroup["髪左1"].ToPar(); X0Y0_髪左2 = partGroup["髪左2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs index ddb731b..8c61826 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs @@ -815,12 +815,12 @@ namespace SlaveMatrix public 前髪_パッツン(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_パッツンD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "パッツン"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][4])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "パッツン"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][4])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪左1 = partGroup["髪左1"].ToPar(); X0Y0_髪左2 = partGroup["髪左2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs index 4888535..3d4ffa4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs @@ -815,12 +815,12 @@ namespace SlaveMatrix public 前髪_モジャ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_モジャD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "モジャ"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "モジャ"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪左1 = partGroup["髪左1"].ToPar(); X0Y0_髪左2 = partGroup["髪左2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs index 4b962b2..298d2cf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs @@ -859,12 +859,12 @@ namespace SlaveMatrix public 前髪_三分1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_三分1D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "三分1"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][7])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "三分1"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][7])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs index 4978ddf..00b3868 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs @@ -790,12 +790,12 @@ namespace SlaveMatrix public 前髪_三分2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_三分2D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "三分2"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][9])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "三分2"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][9])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs index 600a210..b9ceae5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs @@ -724,12 +724,12 @@ namespace SlaveMatrix public 前髪_上げ片(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ片D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "上げ片"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][16])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "上げ片"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][16])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs index bcbe35d..56bfe56 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs @@ -746,12 +746,12 @@ namespace SlaveMatrix public 前髪_上げ短1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ短1D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "上げ短1"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][12])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "上げ短1"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][12])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs index 385cff9..c56a4ec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs @@ -746,12 +746,12 @@ namespace SlaveMatrix public 前髪_上げ短2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ短2D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "上げ短2"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][13])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "上げ短2"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][13])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs index 9094b68..ef2072f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs @@ -746,12 +746,12 @@ namespace SlaveMatrix public 前髪_上げ長1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ長1D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "上げ長1"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][14])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "上げ長1"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][14])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs index b8bc2af..109fa6c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs @@ -746,12 +746,12 @@ namespace SlaveMatrix public 前髪_上げ長2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ長2D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "上げ長2"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][15])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "上げ長2"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][15])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs index 5cc1056..87812a5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs @@ -662,12 +662,12 @@ namespace SlaveMatrix public 前髪_中分け1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_中分け1D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "中分け1"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][10])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "中分け1"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][10])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs index 7f9e0a5..61f443e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs @@ -660,12 +660,12 @@ namespace SlaveMatrix public 前髪_中分け2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_中分け2D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "中分け2"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][11])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "中分け2"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][11])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs index 827a594..1e08add 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs @@ -815,12 +815,12 @@ namespace SlaveMatrix public 前髪_二分1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_二分1D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "二分1"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][6])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "二分1"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][6])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs index 7c593c2..f0c6fdc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs @@ -746,12 +746,12 @@ namespace SlaveMatrix public 前髪_二分2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_二分2D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "二分2"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][8])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "二分2"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][8])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs index 5bee6ca..6114bba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs @@ -769,12 +769,12 @@ namespace SlaveMatrix public 前髪_横流し(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_横流しD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "横流し"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][5])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "横流し"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][5])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs index 6c2e15f..2d21963 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs @@ -727,12 +727,12 @@ namespace SlaveMatrix public 前髪_目隠れ1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_目隠れ1D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "目隠れ1"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][17])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "目隠れ1"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][17])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪左1 = partGroup["髪左1"].ToPar(); X0Y0_髪左2 = partGroup["髪左2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs index 2db027c..5e24a7a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs @@ -746,12 +746,12 @@ namespace SlaveMatrix public 前髪_目隠れ2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_目隠れ2D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "目隠れ2"; - dif.Add(new PartGroup(Sta.胴体["前髪"][0][18])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "目隠れ2"; + morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][18])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_髪基 = partGroup["髪基"].ToPar(); X0Y0_髪左1 = partGroup["髪左1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs index 796472c..106964e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs @@ -927,12 +927,12 @@ namespace SlaveMatrix { 単足_植 単足_植2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "植"; - dif.Add(new PartGroup(Sta.半身["単足"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "植"; + morphVariant.Add(new PartGroup(Sta.半身["単足"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_幹上 = partGroup["幹上"].ToPar(); X0Y0_幹下 = partGroup["幹下"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs index e83371f..dc3df48 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs @@ -805,12 +805,12 @@ namespace SlaveMatrix public 単足_粘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単足_粘D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "粘"; - dif.Add(new PartGroup(Sta.半身["単足"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "粘"; + morphVariant.Add(new PartGroup(Sta.半身["単足"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_粘液0 = partGroup["粘液0"].ToPar(); X0Y0_粘液1 = partGroup["粘液1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs index 7292a20..71ad308 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs @@ -586,10 +586,10 @@ namespace SlaveMatrix public 口_裂け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 口_裂けD e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["口"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["口"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_口 = partGroup["口"].ToPar(); X0Y0_歯 = partGroup["歯"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs index 65117ca..3ada84c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs @@ -790,10 +790,10 @@ namespace SlaveMatrix public 口_通常(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 口_通常D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.胴体["口"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.胴体["口"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_口 = partGroup["口"].ToPar(); X0Y0_口紅上 = partGroup["口紅上"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs index 8b51e25..5699902 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs @@ -104,12 +104,12 @@ namespace SlaveMatrix { 多足_蛸 多足_蛸2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蛸"; - dif.Add(new PartGroup(Sta.半身["多足"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蛸"; + morphVariant.Add(new PartGroup(Sta.半身["多足"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_Torso = partGroup["胴"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs index ed7f8b5..6b0d04b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs @@ -175,12 +175,12 @@ namespace SlaveMatrix { 多足_蜘 多足_蜘2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蜘"; - dif.Add(new PartGroup(Sta.半身["多足"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蜘"; + morphVariant.Add(new PartGroup(Sta.半身["多足"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_Torso = partGroup["Torso"].ToPar(); X0Y0_胸版 = partGroup["胸版"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs index 3fd9e44..dbe7a7b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs @@ -976,12 +976,12 @@ namespace SlaveMatrix { 多足_蠍 多足_蠍2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蠍"; - dif.Add(new PartGroup(Sta.半身["多足"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蠍"; + morphVariant.Add(new PartGroup(Sta.半身["多足"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["前腹"].ToPars(); PartGroup pars3 = pars2["腹節7"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs index 2c35f3b..0cbe41e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs @@ -429,10 +429,10 @@ namespace SlaveMatrix public 大顎(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 大顎D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["虫顎"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["虫顎"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["刺"].ToPars(); X0Y0_棘_棘1 = pars2["刺1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs index 2c94759..7fbfdc5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs @@ -3504,12 +3504,12 @@ namespace SlaveMatrix { 尾_ウ 尾_ウ2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ウミ"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][18])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ウミ"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][18])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾20"].ToPars(); X0Y0_尾20_尾 = pars2["尾"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs index 6476d92..1aa4570 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs @@ -2195,12 +2195,12 @@ namespace SlaveMatrix public 尾_ガ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_ガD e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ガラ"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][17])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ガラ"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][17])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾 = partGroup["尾"].ToPar(); PartGroup pars2 = partGroup["尾9"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs index 3e3f91c..4aa4dfa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs @@ -5726,12 +5726,12 @@ namespace SlaveMatrix { 尾_ヘ 尾_ヘ2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "ヘビ"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][16])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "ヘビ"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][16])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾35"].ToPars(); X0Y0_尾35_尾 = pars2["尾"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs index 75fd981..9225fc6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs @@ -657,12 +657,12 @@ namespace SlaveMatrix public 尾_悪(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_悪D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "悪尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][7])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "悪尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][7])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs index 5b105e3..c1a13f6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs @@ -1392,12 +1392,12 @@ namespace SlaveMatrix public 尾_根(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_根D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "根尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][22])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "根尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][22])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾0"].ToPars(); X0Y0_尾0_尾 = pars2["尾"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs index cd59297..53b76b0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs @@ -657,12 +657,12 @@ namespace SlaveMatrix public 尾_淫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_淫D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "淫尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][8])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "淫尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][8])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs index 70dd96d..b37ea24 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs @@ -1078,12 +1078,12 @@ namespace SlaveMatrix public 尾_牛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_牛D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "牛尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][4])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "牛尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][4])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs index 37371af..dfb2af4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs @@ -238,12 +238,12 @@ namespace SlaveMatrix public 尾_犬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_犬D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "犬尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "犬尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs index 62268d8..18d147c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs @@ -322,12 +322,12 @@ namespace SlaveMatrix public 尾_狐(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_狐D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "狐尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "狐尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs index 2e757bc..12ee6bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs @@ -364,12 +364,12 @@ namespace SlaveMatrix public 尾_猫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_猫D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "猫尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "猫尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs index ef0a9a0..bb34550 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs @@ -196,12 +196,12 @@ namespace SlaveMatrix public 尾_短(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_短D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "短尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][15])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "短尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][15])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs index 92d20a9..a5e667c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs @@ -788,12 +788,12 @@ namespace SlaveMatrix public 尾_竜(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_竜D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "竜尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][6])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "竜尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][6])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾17 = partGroup["尾17"].ToPar(); X0Y0_針 = partGroup["針"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs index a6e020a..f596a23 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs @@ -5096,12 +5096,12 @@ namespace SlaveMatrix public 尾_腓(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_腓D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "腓尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][14])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "腓尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][14])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾1"].ToPars(); X0Y0_尾1_根 = pars2["根"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs index e7c573f..b90846b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs @@ -641,12 +641,12 @@ namespace SlaveMatrix public 尾_虫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_虫D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "虫尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][10])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "虫尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][10])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾10 = partGroup["尾10"].ToPar(); X0Y0_針 = partGroup["針"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs index ea4f37a..c71ad53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs @@ -5093,12 +5093,12 @@ namespace SlaveMatrix public 尾_蛇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_蛇D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蛇尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][13])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蛇尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][13])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾1"].ToPars(); X0Y0_尾1_根 = pars2["根"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs index 7a632f3..be410fa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs @@ -451,12 +451,12 @@ namespace SlaveMatrix { 尾_蜘 尾_蜘2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蜘尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][11])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蜘尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][11])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_柄0 = partGroup["柄0"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs index 9c35580..b6a62cf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs @@ -1550,12 +1550,12 @@ namespace SlaveMatrix { 尾_蟲 尾_蟲2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蟲尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][21])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蟲尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][21])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾5"].ToPars(); X0Y0_尾5_背板 = pars2["背板"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs index d2dd473..1a66f65 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs @@ -872,12 +872,12 @@ namespace SlaveMatrix public 尾_蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_蠍D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蠍尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][12])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蠍尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][12])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["節1"].ToPars(); X0Y0_節1_尾 = pars2["尾"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs index 42ef866..a024dbf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs @@ -910,12 +910,12 @@ namespace SlaveMatrix public 尾_馬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_馬D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "馬尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "馬尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); X0Y0_尾1 = partGroup["尾1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs index 7b75e94..c36da7a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs @@ -7399,12 +7399,12 @@ namespace SlaveMatrix { 尾_魚 尾_魚2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "魚尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][19])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "魚尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][19])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾33"].ToPars(); PartGroup pars3 = pars2["鱗左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs index b4b38b4..9cb5e1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs @@ -2830,12 +2830,12 @@ namespace SlaveMatrix { 尾_鯨 尾_鯨2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鯨尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][20])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鯨尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][20])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["尾33"].ToPars(); X0Y0_尾33_尾 = pars2["尾"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs index b20f6bc..c75b7d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs @@ -601,12 +601,12 @@ namespace SlaveMatrix public 尾_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_鳥D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鳥尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][9])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鳥尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][9])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾0 = partGroup["尾0"].ToPar(); PartGroup pars2 = partGroup["風切羽"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs index 84e7fb0..b04e08e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs @@ -1250,12 +1250,12 @@ namespace SlaveMatrix public 尾_龍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_龍D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "龍尾"; - dif.Add(new PartGroup(Sta.尻尾["尾"][0][5])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "龍尾"; + morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][5])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_尾40 = partGroup["尾40"].ToPar(); X0Y0_尾39 = partGroup["尾39"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs index 17c90da..106037b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs @@ -488,10 +488,10 @@ namespace SlaveMatrix public 尾鰭_魚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾鰭_魚D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢中["尾"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢中["尾"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["鰭左2"].ToPars(); X0Y0_鰭左2_鰭膜 = pars2["鰭膜"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs index 451c8a1..8f0d938 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs @@ -107,12 +107,12 @@ namespace SlaveMatrix public 尾鰭_鯨(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾鰭_鯨D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鯨鰭"; - dif.Add(new PartGroup(Sta.肢中["尾"][1][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鯨鰭"; + morphVariant.Add(new PartGroup(Sta.肢中["尾"][1][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_鰭 = partGroup["鰭"].ToPar(); X0Y0_尾 = partGroup["尾"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs index 66fb945..54b1565 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs @@ -353,10 +353,10 @@ namespace SlaveMatrix public 後翅_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_甲D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["後翅"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); PartGroup pars2 = partGroup["後翅根"].ToPars(); X0Y0_後翅_後翅根_後翅 = pars2["後翅"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs index 1e2e4b2..472c970 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs @@ -1038,10 +1038,10 @@ namespace SlaveMatrix public 後翅_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_羽D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["後翅"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); X0Y0_後翅_後翅 = partGroup["後翅"].ToPar(); X0Y0_後翅_翅脈1 = partGroup["翅脈1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs index b1a689d..1ff74d7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs @@ -1285,10 +1285,10 @@ namespace SlaveMatrix public 後翅_草(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_草D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["後翅"][3]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][3]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); PartGroup pars2 = partGroup["後翅1"].ToPars(); X0Y0_後翅_後翅1_後翅 = pars2["後翅"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs index d22a632..9439e33 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs @@ -661,10 +661,10 @@ namespace SlaveMatrix public 後翅_蝶(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_蝶D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["後翅"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); X0Y0_後翅_後翅 = partGroup["後翅"].ToPar(); PartGroup pars2 = partGroup["水青"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs index af86f76..5e671ae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs @@ -355,12 +355,12 @@ namespace SlaveMatrix public 手_牛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_牛D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "牛"; - dif.Add(new PartGroup(Sta.腕左["四足手"][1][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "牛"; + morphVariant.Add(new PartGroup(Sta.腕左["四足手"][1][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_指0 = partGroup["指0"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs index 099ca61..6a2e54d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs @@ -359,12 +359,12 @@ namespace SlaveMatrix public 手_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_獣D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "獣"; - dif.Add(new PartGroup(Sta.腕左["四足手"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "獣"; + morphVariant.Add(new PartGroup(Sta.腕左["四足手"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_手 = partGroup["手"].ToPar(); PartGroup pars2 = partGroup["親指"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs index b01929f..c174705 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs @@ -313,12 +313,12 @@ namespace SlaveMatrix public 手_馬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_馬D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "馬"; - dif.Add(new PartGroup(Sta.腕左["四足手"][1][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "馬"; + morphVariant.Add(new PartGroup(Sta.腕左["四足手"][1][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_指0 = partGroup["指0"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs index db13392..4a392fc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs @@ -1167,12 +1167,12 @@ namespace SlaveMatrix PartGroup partGroup = new PartGroup(Sta.肢左["植"][0][0]); partGroup.Remove("花"); partGroup.Remove("萼"); - Dif dif = new Dif(); - dif.Tag = "植"; - dif.Add(partGroup); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "植"; + morphVariant.Add(partGroup); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; PartGroup pars3 = pars2["通常葉4"].ToPars(); PartGroup pars4 = pars3["通常"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs index eb1eadd..5bda689 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs @@ -1514,10 +1514,10 @@ namespace SlaveMatrix public 潮吹_大_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_大_人D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.性器付["潮吹"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.性器付["潮吹"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_潮吹基 = partGroup["潮吹基"].ToPar(); X0Y0_雫1 = partGroup["雫1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs index 272bad9..898df61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs @@ -1514,10 +1514,10 @@ namespace SlaveMatrix public 潮吹_大_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_大_獣D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.性器付["四足潮吹"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.性器付["四足潮吹"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_潮吹基 = partGroup["潮吹基"].ToPar(); X0Y0_雫1 = partGroup["雫1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs index 29a9339..018ae4e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs @@ -134,10 +134,10 @@ namespace SlaveMatrix public 潮吹_小_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_小_人D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.性器付["潮吹"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.性器付["潮吹"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_雫 = partGroup["雫"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs index c911eb6..9e60b20 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs @@ -134,10 +134,10 @@ namespace SlaveMatrix public 潮吹_小_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_小_獣D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.性器付["四足潮吹"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.性器付["四足潮吹"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_雫 = partGroup["雫"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs index 564b5ce..af5454f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs @@ -337,12 +337,12 @@ namespace SlaveMatrix public 節尾_曳航(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節尾_曳航D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "曳航肢"; - dif.Add(new PartGroup(Sta.肢左["節足"][0][5])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "曳航肢"; + morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][5])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_前腿節 = partGroup["前腿節"].ToPar(); X0Y0_腿節 = partGroup["腿節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs index 7f1823d..febf29f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs @@ -316,12 +316,12 @@ namespace SlaveMatrix public 節尾_鋏(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節尾_鋏D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鋏"; - dif.Add(new PartGroup(Sta.肢左["節足"][0][6])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鋏"; + morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][6])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_牙 = partGroup["牙"].ToPar(); PartGroup pars2 = partGroup["輪"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs index 57d6c7e..4e1eb6d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs @@ -375,12 +375,12 @@ namespace SlaveMatrix public 節足_足百(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節足_足百D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "節足百"; - dif.Add(new PartGroup(Sta.肢左["節足"][0][4])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "節足百"; + morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][4])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_基節 = partGroup["基節"].ToPar(); X0Y0_転節 = partGroup["転節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs index bca6575..2406aa6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs @@ -500,12 +500,12 @@ namespace SlaveMatrix public 節足_足蜘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節足_足蜘D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "節足蜘"; - dif.Add(new PartGroup(Sta.肢左["節足"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "節足蜘"; + morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_基節 = partGroup["基節"].ToPar(); X0Y0_転節 = partGroup["転節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs index 2281a26..89cfef7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs @@ -458,12 +458,12 @@ namespace SlaveMatrix public 節足_足蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節足_足蠍D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "節足蠍"; - dif.Add(new PartGroup(Sta.肢左["節足"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "節足蠍"; + morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_転節 = partGroup["転節"].ToPar(); X0Y0_腿節 = partGroup["腿節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs index 1b4bb90..bb06272 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs @@ -122,8 +122,8 @@ namespace SlaveMatrix ThisType = GetType(); Body = new Difs(); Body.Tag = "通"; - Body.Add(new Dif(Sta.肢左["耳"][0])); - Body.Add(new Dif(Sta.肢左["耳"][1])); + Body.Add(new MorphVariant(Sta.肢左["耳"][0])); + Body.Add(new MorphVariant(Sta.肢左["耳"][1])); PartGroup partGroup = Body[0][0]; X0Y0_耳 = partGroup["耳"].ToPar(); X0Y0_耳線 = partGroup["耳線"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs index 451bf49..8500df8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs @@ -170,8 +170,8 @@ namespace SlaveMatrix ThisType = GetType(); Body = new Difs(); Body.Tag = "尖"; - Body.Add(new Dif(Sta.肢左["耳"][2])); - Body.Add(new Dif(Sta.肢左["耳"][3])); + Body.Add(new MorphVariant(Sta.肢左["耳"][2])); + Body.Add(new MorphVariant(Sta.肢左["耳"][3])); PartGroup partGroup = Body[0][0]; X0Y0_耳 = partGroup["耳"].ToPar(); X0Y0_耳線 = partGroup["耳線"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs index 99527ad..ecb4bf6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs @@ -221,8 +221,8 @@ namespace SlaveMatrix ThisType = GetType(); Body = new Difs(); Body.Tag = "獣"; - Body.Add(new Dif(Sta.肢左["耳"][10])); - Body.Add(new Dif(Sta.肢左["耳"][11])); + Body.Add(new MorphVariant(Sta.肢左["耳"][10])); + Body.Add(new MorphVariant(Sta.肢左["耳"][11])); PartGroup partGroup = Body[0][0]; X0Y0_耳 = partGroup["耳"].ToPar(); X0Y0_耳線1 = partGroup["耳線1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs index 8e29b93..50a9674 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs @@ -323,8 +323,8 @@ namespace SlaveMatrix ThisType = GetType(); Body = new Difs(); Body.Tag = "羽"; - Body.Add(new Dif(Sta.肢左["耳"][8])); - Body.Add(new Dif(Sta.肢左["耳"][9])); + Body.Add(new MorphVariant(Sta.肢左["耳"][8])); + Body.Add(new MorphVariant(Sta.肢左["耳"][9])); PartGroup partGroup = Body[0][0]; X0Y0_羽2 = partGroup["羽2"].ToPar(); X0Y0_羽1 = partGroup["羽1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs index 8d7b4b7..6b7af25 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs @@ -221,8 +221,8 @@ namespace SlaveMatrix ThisType = GetType(); Body = new Difs(); Body.Tag = "長"; - Body.Add(new Dif(Sta.肢左["耳"][4])); - Body.Add(new Dif(Sta.肢左["耳"][5])); + Body.Add(new MorphVariant(Sta.肢左["耳"][4])); + Body.Add(new MorphVariant(Sta.肢左["耳"][5])); PartGroup partGroup = Body[0][0]; X0Y0_耳 = partGroup["耳"].ToPar(); X0Y0_耳線1 = partGroup["耳線1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs index 554ee25..df96a3c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs @@ -388,8 +388,8 @@ namespace SlaveMatrix ThisType = GetType(); Body = new Difs(); Body.Tag = "鰭"; - Body.Add(new Dif(Sta.肢左["耳"][6])); - Body.Add(new Dif(Sta.肢左["耳"][7])); + Body.Add(new MorphVariant(Sta.肢左["耳"][6])); + Body.Add(new MorphVariant(Sta.肢左["耳"][7])); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["鰭耳3"].ToPars(); X0Y0_鰭耳3_鰭膜 = pars2["鰭膜"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs index a0a08a5..1485cae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs @@ -108,12 +108,12 @@ namespace SlaveMatrix public 背中_光(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 背中_光D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "後光"; - dif.Add(new PartGroup(Sta.肢中["背中"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "後光"; + morphVariant.Add(new PartGroup(Sta.肢中["背中"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_後光左 = partGroup["後光左"].ToPar(); X0Y0_後光右 = partGroup["後光右"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs index 58edcad..217f6b2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs @@ -857,12 +857,12 @@ namespace SlaveMatrix public 背中_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 背中_甲D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "甲羅"; - dif.Add(new PartGroup(Sta.肢中["背中"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "甲羅"; + morphVariant.Add(new PartGroup(Sta.肢中["背中"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["左"].ToPars(); X0Y0_左_甲羅1 = pars2["甲羅1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs index a3334df..20ca406 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs @@ -107,12 +107,12 @@ namespace SlaveMatrix public 背中_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 背中_羽D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "羽毛"; - dif.Add(new PartGroup(Sta.肢中["背中"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "羽毛"; + morphVariant.Add(new PartGroup(Sta.肢中["背中"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_羽毛1 = partGroup["羽毛1"].ToPar(); X0Y0_羽毛2 = partGroup["羽毛2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs index 4824f08..37bf247 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs @@ -154,10 +154,10 @@ namespace SlaveMatrix { 腿_獣 腿_獣2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足腿"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_腿 = partGroup["腿"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs index 5f8edae..e981910 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs @@ -322,10 +322,10 @@ namespace SlaveMatrix { 腿_竜 腿_竜2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足腿"][3]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][3]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_腿 = partGroup["腿"].ToPar(); PartGroup pars2 = partGroup["鱗下"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs index b40b464..0b0b7cd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs @@ -112,10 +112,10 @@ namespace SlaveMatrix { 腿_蹄 腿_蹄2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足腿"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_腿 = partGroup["腿"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs index 115d193..114b3f4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs @@ -112,10 +112,10 @@ namespace SlaveMatrix { 腿_鳥 腿_鳥2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.脚左["四足腿"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_腿 = partGroup["腿"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs index 567d012..5741fe5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs @@ -174,12 +174,12 @@ namespace SlaveMatrix public 舌_短(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 舌_短D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "短"; - dif.Add(new PartGroup(Sta.胴体["舌"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "短"; + morphVariant.Add(new PartGroup(Sta.胴体["舌"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_舌1 = partGroup["舌1"].ToPar(); X0Y0_舌2 = partGroup["舌2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs index 38c0862..bdcf72f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs @@ -449,12 +449,12 @@ namespace SlaveMatrix public 舌_長(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 舌_長D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "長"; - dif.Add(new PartGroup(Sta.胴体["舌"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "長"; + morphVariant.Add(new PartGroup(Sta.胴体["舌"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_舌1 = partGroup["舌1"].ToPar(); X0Y0_舌2 = partGroup["舌2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs index bfcaad7..c909e9f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs @@ -1500,12 +1500,12 @@ namespace SlaveMatrix PartGroup pars2 = Sta.肢左["植"][0][0]; partGroup.Add("ユリ", new PartGroup(pars2["花"].ToPars()["ユリ"].ToPars())); partGroup.Add("萼", new PartGroup(pars2["萼"].ToPars())); - Dif dif = new Dif(); - dif.Tag = "花"; - dif.Add(new PartGroup(partGroup)); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "花"; + morphVariant.Add(new PartGroup(partGroup)); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup pars3 = Body[0][0]; PartGroup pars4 = pars3["ユリ"].ToPars(); PartGroup pars5 = pars4["通常"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs index b7e198c..772419c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs @@ -915,12 +915,12 @@ namespace SlaveMatrix PartGroup pars2 = Sta.肢左["植"][0][0]; partGroup.Add("バラ", new PartGroup(pars2["花"].ToPars()["バラ"].ToPars())); partGroup.Add("萼", new PartGroup(pars2["萼"].ToPars())); - Dif dif = new Dif(); - dif.Tag = "花"; - dif.Add(new PartGroup(partGroup)); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "花"; + morphVariant.Add(new PartGroup(partGroup)); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup pars3 = Body[0][0]; PartGroup pars4 = pars3["バラ"].ToPars(); PartGroup pars5 = pars4["通常"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs index 1890584..6a15088 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs @@ -145,10 +145,10 @@ namespace SlaveMatrix public 葉_心(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 葉_心D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["葉"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["葉"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_通常_葉 = partGroup["葉"].ToPar(); X0Y0_通常_葉脈 = partGroup["葉脈"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs index 489325b..d64caee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs @@ -145,10 +145,10 @@ namespace SlaveMatrix public 葉_披(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 葉_披D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["葉"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["葉"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_通常_葉 = partGroup["葉"].ToPar(); X0Y0_通常_葉脈 = partGroup["葉脈"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs index 35ad3d0..056db4f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs @@ -170,10 +170,10 @@ namespace SlaveMatrix public 虫顎(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 虫顎D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["虫顎"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["虫顎"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_顎 = partGroup["顎"].ToPar(); X0Y0_節 = partGroup["節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs index 816e809..8c3f16a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs @@ -369,10 +369,10 @@ namespace SlaveMatrix public 角1_一(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角1_一D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢中["角"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢中["角"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_線1 = partGroup["線1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs index 0c553d9..e0a6a47 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs @@ -278,10 +278,10 @@ namespace SlaveMatrix public 角1_虫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角1_虫D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢中["角"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.肢中["角"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); PartGroup pars2 = partGroup["器官左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs index cd3c7e7..2f91832 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs @@ -252,10 +252,10 @@ namespace SlaveMatrix public 角1_鬼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角1_鬼D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢中["角"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.肢中["角"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_線1 = partGroup["線1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs index 8db274d..32e733f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs @@ -285,10 +285,10 @@ namespace SlaveMatrix public 角2_山1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_山1D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_凸1 = partGroup["凸1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs index bbfd3ef..9698890 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs @@ -333,10 +333,10 @@ namespace SlaveMatrix public 角2_山2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_山2D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_凸1 = partGroup["凸1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs index 0131588..8ed77d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs @@ -532,10 +532,10 @@ namespace SlaveMatrix public 角2_山3(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_山3D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["根"].ToPars(); X0Y0_根_根 = pars2["根"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs index ccc4956..5bd3a9d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs @@ -417,10 +417,10 @@ namespace SlaveMatrix public 角2_巻(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_巻D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][3]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][3]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["根"].ToPars(); X0Y0_根_根 = pars2["根"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs index f4dadd4..b07b9dd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs @@ -300,10 +300,10 @@ namespace SlaveMatrix public 角2_牛1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛1D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][4]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][4]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_凹1 = partGroup["凹1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs index 57cda87..d457278 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs @@ -252,10 +252,10 @@ namespace SlaveMatrix public 角2_牛2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛2D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][5]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][5]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_凹1 = partGroup["凹1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs index e867ee0..e8174a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs @@ -264,10 +264,10 @@ namespace SlaveMatrix public 角2_牛3(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛3D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][6]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][6]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_凹1 = partGroup["凹1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs index fd7b67a..8da59d3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs @@ -321,10 +321,10 @@ namespace SlaveMatrix public 角2_牛4(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛4D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][7]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][7]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_凹1 = partGroup["凹1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs index b4a0ee8..c30588b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs @@ -351,10 +351,10 @@ namespace SlaveMatrix public 角2_虫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_虫D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][9]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][9]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); PartGroup pars2 = partGroup["刺"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs index 833b180..d636ac4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs @@ -273,10 +273,10 @@ namespace SlaveMatrix public 角2_鬼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_鬼D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["角"][8]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][8]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_根 = partGroup["根"].ToPar(); X0Y0_線1 = partGroup["線1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs index e26ea24..28e8044 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs @@ -6063,12 +6063,12 @@ namespace SlaveMatrix { 触手_犬 触手_犬2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "スキュラ"; - dif.Add(new PartGroup(Sta.肢左["触手"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "スキュラ"; + morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["脚後"].ToPars(); PartGroup pars3 = pars2["鰭"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs index f049743..ff8b740 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs @@ -3283,12 +3283,12 @@ namespace SlaveMatrix { 触手_蔦 触手_蔦2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蔦"; - dif.Add(new PartGroup(Sta.肢左["触手"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蔦"; + morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["節1"].ToPars(); X0Y0_節1_節 = pars2["節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs index 452d013..3a73c60 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs @@ -3774,12 +3774,12 @@ namespace SlaveMatrix public 触手_触(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触手_触D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "触腕"; - dif.Add(new PartGroup(Sta.肢左["触手"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "触腕"; + morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["腕部"].ToPars(); PartGroup pars3 = pars2["節1"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs index 95f2da1..66be42e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs @@ -7281,12 +7281,12 @@ namespace SlaveMatrix public 触手_軟(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触手_軟D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "軟体"; - dif.Add(new PartGroup(Sta.肢左["触手"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "軟体"; + morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["節1"].ToPars(); X0Y0_節1_節 = pars2["節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs index 50ab5c5..5c59e23 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs @@ -354,12 +354,12 @@ namespace SlaveMatrix public 触肢_肢蜘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触肢_肢蜘D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "触肢蜘"; - dif.Add(new PartGroup(Sta.肢左["節足"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "触肢蜘"; + morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_基節 = partGroup["基節"].ToPar(); X0Y0_転節 = partGroup["転節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs index ac07057..f081a69 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs @@ -493,12 +493,12 @@ namespace SlaveMatrix public 触肢_肢蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触肢_肢蠍D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "触肢蠍"; - dif.Add(new PartGroup(Sta.肢左["節足"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "触肢蠍"; + morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_爪2 = partGroup["爪2"].ToPar(); X0Y0_爪1 = partGroup["爪1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs index e9495e4..fd6f835 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs @@ -297,12 +297,12 @@ namespace SlaveMatrix public 触覚_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_甲D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "甲"; - dif.Add(new PartGroup(Sta.肢左["触覚"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "甲"; + morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_節0 = partGroup["節0"].ToPar(); X0Y0_節1 = partGroup["節1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs index f7c51c0..4304c41 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs @@ -612,12 +612,12 @@ namespace SlaveMatrix public 触覚_節(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_節D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "節"; - dif.Add(new PartGroup(Sta.肢左["触覚"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "節"; + morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_節1 = partGroup["節1"].ToPar(); X0Y0_節2 = partGroup["節2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs index f3e7f6d..a73d2bf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs @@ -1326,12 +1326,12 @@ namespace SlaveMatrix public 触覚_線(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_線D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "線"; - dif.Add(new PartGroup(Sta.肢左["触覚"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "線"; + morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_節1 = partGroup["節1"].ToPar(); X0Y0_節2 = partGroup["節2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs index 4f9efb0..cf2b7d1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs @@ -3237,12 +3237,12 @@ namespace SlaveMatrix public 触覚_蛾(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_蛾D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蛾"; - dif.Add(new PartGroup(Sta.肢左["触覚"][0][4])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蛾"; + morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][4])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["節1"].ToPars(); X0Y0_節1_節 = pars2["節"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs index aff4ea6..e9ee63c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs @@ -801,12 +801,12 @@ namespace SlaveMatrix public 触覚_蝶(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_蝶D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蝶"; - dif.Add(new PartGroup(Sta.肢左["触覚"][0][3])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蝶"; + morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][3])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_節1 = partGroup["節1"].ToPar(); X0Y0_節2 = partGroup["節2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs index c0a9f4f..787609e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs @@ -485,12 +485,12 @@ namespace SlaveMatrix public 触覚_蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_蠍D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "蠍"; - dif.Add(new PartGroup(Sta.肢左["触覚"][0][5])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "蠍"; + morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][5])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["櫛状板1"].ToPars(); X0Y0_櫛状版1_櫛状版1 = pars2["櫛状板1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs index d94944e..0c545e1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs @@ -418,12 +418,12 @@ namespace SlaveMatrix public 足_牛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_牛D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "牛"; - dif.Add(new PartGroup(Sta.脚左["四足足"][1][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "牛"; + morphVariant.Add(new PartGroup(Sta.脚左["四足足"][1][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_足 = partGroup["足"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs index 4124123..c0ede67 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs @@ -586,12 +586,12 @@ namespace SlaveMatrix public 足_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_獣D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "獣"; - dif.Add(new PartGroup(Sta.脚左["四足足"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "獣"; + morphVariant.Add(new PartGroup(Sta.脚左["四足足"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_足 = partGroup["足"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs index ecb8e90..1b62dba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs @@ -1279,12 +1279,12 @@ namespace SlaveMatrix public 足_竜(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_竜D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "竜"; - dif.Add(new PartGroup(Sta.脚左["四足足"][3][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "竜"; + morphVariant.Add(new PartGroup(Sta.脚左["四足足"][3][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_足 = partGroup["足"].ToPar(); PartGroup pars2 = partGroup["鱗足"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs index 6d20916..15c5ee2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs @@ -334,12 +334,12 @@ namespace SlaveMatrix public 足_馬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_馬D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "馬"; - dif.Add(new PartGroup(Sta.脚左["四足足"][1][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "馬"; + morphVariant.Add(new PartGroup(Sta.脚左["四足足"][1][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_足 = partGroup["足"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs index e4a0aef..81d1022 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs @@ -1867,12 +1867,12 @@ namespace SlaveMatrix public 足_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_鳥D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鳥"; - dif.Add(new PartGroup(Sta.脚左["四足足"][2][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鳥"; + morphVariant.Add(new PartGroup(Sta.脚左["四足足"][2][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_足 = partGroup["足"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index 63dfca4..9459e81 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -308,12 +308,12 @@ namespace SlaveMatrix PartGroup partGroup = new PartGroup(); partGroup.Tag = "蛇"; partGroup.Add(new PartGroup(Sta.半身["長物"][0][2]["胴1"].ToPars())); - Dif dif = new Dif(); - dif.Tag = partGroup.Tag; - dif.Add(partGroup); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = partGroup.Tag; + morphVariant.Add(partGroup); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup pars2 = Body[0][0]["胴1"].ToPars(); X0Y0_Torso1_Torso = pars2["胴"].ToPar(); X0Y0_Torso1_鱗2 = pars2["鱗2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index 51d2934..a792c76 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -521,12 +521,12 @@ namespace SlaveMatrix partGroup.Tag = "蟲"; partGroup.Add(new PartGroup(Sta.半身["長物"][0][3]["胴1"].ToPars())); partGroup.Add(new PartGroup(Sta.半身["長物"][0][3]["輪1"].ToPars())); - Dif dif = new Dif(); - dif.Tag = partGroup.Tag; - dif.Add(partGroup); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = partGroup.Tag; + morphVariant.Add(partGroup); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; PartGroup pars3 = pars2["胴1"].ToPars(); X0Y0_Torso1_背板 = pars3["背板"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs index f966569..53a327b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs @@ -1896,12 +1896,12 @@ namespace SlaveMatrix { 長物_魚 長物_魚2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "魚"; - dif.Add(new PartGroup(Sta.半身["長物"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "魚"; + morphVariant.Add(new PartGroup(Sta.半身["長物"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["胴6"].ToPars(); PartGroup pars3 = pars2["鱗左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs index 959e662..3687914 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs @@ -879,12 +879,12 @@ namespace SlaveMatrix { 長物_鯨 長物_鯨2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鯨"; - dif.Add(new PartGroup(Sta.半身["長物"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鯨"; + morphVariant.Add(new PartGroup(Sta.半身["長物"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["胴6"].ToPars(); X0Y0_Torso6_Torso = pars2["胴"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs index 47d2429..721fc69 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs @@ -108,12 +108,12 @@ namespace SlaveMatrix public 頭頂_天(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頭頂_天D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "天輪"; - dif.Add(new PartGroup(Sta.肢中["頭部前"][0][2])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "天輪"; + morphVariant.Add(new PartGroup(Sta.肢中["頭部前"][0][2])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_天輪上 = partGroup["天輪上"].ToPar(); X0Y0_天輪下 = partGroup["天輪下"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs index e1d92c9..1ab22f5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs @@ -1859,12 +1859,12 @@ namespace SlaveMatrix { 頭頂_宇 頭頂_宇2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "エイリアン"; - dif.Add(new PartGroup(Sta.肢中["頭部前"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "エイリアン"; + morphVariant.Add(new PartGroup(Sta.肢中["頭部前"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_頭部 = partGroup["頭部"].ToPar(); PartGroup pars2 = partGroup["頭頂部"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs index bdd34b3..8ab3d2e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs @@ -209,12 +209,12 @@ namespace SlaveMatrix public 頭頂_皿(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頭頂_皿D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "皿"; - dif.Add(new PartGroup(Sta.肢中["頭部前"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "皿"; + morphVariant.Add(new PartGroup(Sta.肢中["頭部前"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_皿1 = partGroup["皿1"].ToPar(); X0Y0_皿2 = partGroup["皿2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs index 18031d5..4e23ccb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs @@ -212,12 +212,12 @@ namespace SlaveMatrix public 頭頂後_宇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頭頂後_宇D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "エイリアン"; - dif.Add(new PartGroup(Sta.肢中["頭部後"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "エイリアン"; + morphVariant.Add(new PartGroup(Sta.肢中["頭部後"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_頭部 = partGroup["頭部"].ToPar(); PartGroup pars2 = partGroup["線"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs index 65ac1aa..b614dae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs @@ -509,10 +509,10 @@ namespace SlaveMatrix { 顔面_甲 顔面_甲2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.肢中["顔面"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢中["顔面"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_面額 = partGroup["面額"].ToPar(); PartGroup pars2 = partGroup["面左下"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs index cd5cf63..03db25d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs @@ -639,10 +639,10 @@ namespace SlaveMatrix { 顔面_虫 顔面_虫2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.肢中["顔面"][1]); + MorphVariant morphVariant = new MorphVariant(Sta.肢中["顔面"][1]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_面基 = partGroup["面基"].ToPar(); PartGroup pars2 = partGroup["複眼左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs index de62877..05ee220 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs @@ -823,10 +823,10 @@ namespace SlaveMatrix { 顔面_蟲 顔面_蟲2 = this; ThisType = GetType(); - Dif dif = new Dif(Sta.肢中["顔面"][2]); + MorphVariant morphVariant = new MorphVariant(Sta.肢中["顔面"][2]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_面 = partGroup["面"].ToPar(); PartGroup pars2 = partGroup["眼左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs index 1c3619c..e9ab63f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs @@ -86,12 +86,12 @@ namespace SlaveMatrix public 鰭_豚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鰭_豚D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "豚鰭"; - dif.Add(new PartGroup(Sta.肢左["鰭"][1][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "豚鰭"; + morphVariant.Add(new PartGroup(Sta.肢左["鰭"][1][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_鰭 = partGroup["鰭"].ToPar(); Xasix = false; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs index adf896f..fcff15d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs @@ -174,10 +174,10 @@ namespace SlaveMatrix public 鰭_魚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鰭_魚D e) { ThisType = GetType(); - Dif dif = new Dif(Sta.肢左["鰭"][0]); + MorphVariant morphVariant = new MorphVariant(Sta.肢左["鰭"][0]); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["鰭2"].ToPars(); X0Y0_鰭2_鰭膜 = pars2["鰭膜"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs index d01cb60..432df70 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs @@ -86,12 +86,12 @@ namespace SlaveMatrix public 鰭_鯨(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鰭_鯨D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鯨鰭"; - dif.Add(new PartGroup(Sta.肢左["鰭"][1][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鯨鰭"; + morphVariant.Add(new PartGroup(Sta.肢左["鰭"][1][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_鰭 = partGroup["鰭"].ToPar(); Xasix = false; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs index 6383bb7..96b99b8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs @@ -1402,12 +1402,12 @@ namespace SlaveMatrix public 鳳凰(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鳳凰D e) { ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "鳳凰"; - dif.Add(new PartGroup(Sta.肢中["尾"][2][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "鳳凰"; + morphVariant.Add(new PartGroup(Sta.肢中["尾"][2][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["羽"].ToPars(); X0Y0_羽_羽 = pars2["羽"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs index c119f64..29c091a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs @@ -92,12 +92,12 @@ namespace SlaveMatrix { 鼻_人 鼻_人2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "人"; - dif.Add(new PartGroup(Sta.胴体["鼻"][0][0])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "人"; + morphVariant.Add(new PartGroup(Sta.胴体["鼻"][0][0])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_鼻 = partGroup["鼻"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs index 6c43c85..6fc6099 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs @@ -92,12 +92,12 @@ namespace SlaveMatrix { 鼻_獣 鼻_獣2 = this; ThisType = GetType(); - Dif dif = new Dif(); - dif.Tag = "獣"; - dif.Add(new PartGroup(Sta.胴体["鼻"][0][1])); + MorphVariant morphVariant = new MorphVariant(); + morphVariant.Tag = "獣"; + morphVariant.Add(new PartGroup(Sta.胴体["鼻"][0][1])); Body = new Difs(); - Body.Tag = dif.Tag; - Body.Add(dif); + Body.Tag = morphVariant.Tag; + Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; X0Y0_鼻 = partGroup["鼻"].ToPar(); Body.SetJoints();