diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index f093fb2..71650da 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -219,7 +219,7 @@ public class UmaViewerUI : MonoBehaviour { foreach (FacialMorph morph in targetMorph) { - if(morph is FacialExtraMorph extraMorph) + if(morph is FacialOtherMorph extraMorph) { foreach(var prop in extraMorph.BindProperties) { diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index f08b77b..6d0e7b6 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -27,7 +27,7 @@ namespace Gallop public List EyeBrowMorphs = new List(); public List EyeMorphs = new List(); public List MouthMorphs = new List(); - public List OtherMorphs = new List(); + public List OtherMorphs = new List(); public Transform DrivenKeyLocator; public Transform EyeballCtrl_L_Locator, EyeballCtrl_R_Locator, EyeballCtrl_All_Locator; @@ -175,7 +175,7 @@ namespace Gallop { if (Container.CheekTex_0) { - var CheekMorph = new FacialExtraMorph + var CheekMorph = new FacialOtherMorph { name = "Cheek_Ctrl", locator = DrivenKeyLocator.Find("Cheek_Ctrl"), @@ -224,7 +224,7 @@ namespace Gallop Container.FaceMaterial = Container.Head.transform.Find("M_Face").GetComponent().material; if (Container.FaceMaterial) { - FacialExtraMorph FaceShadowMorph = new FacialExtraMorph() + FacialOtherMorph FaceShadowMorph = new FacialOtherMorph() { name = "Shade_Ctrl", locator = DrivenKeyLocator.Find("Shade_Ctrl") @@ -240,7 +240,7 @@ namespace Gallop OtherMorphs.Add(FaceShadowMorph); } - FacialExtraMorph FaceMangaMorph = new FacialExtraMorph() + FacialOtherMorph FaceMangaMorph = new FacialOtherMorph() { name = "Manga_Ctrl", locator = DrivenKeyLocator.Find("Manga_Ctrl") @@ -266,7 +266,7 @@ namespace Gallop foreach(var tear in Container.TearControllers) { var index = Container.TearControllers.IndexOf(tear); - FacialExtraMorph FaceTearMorph = new FacialExtraMorph() + FacialOtherMorph FaceTearMorph = new FacialOtherMorph() { name = $"Tear{index}_Ctrl", locator = DrivenKeyLocator.Find($"Tear{index}_Ctrl") @@ -385,7 +385,7 @@ namespace Gallop } } - private void ProcessExtraMorph(FacialExtraMorph morph) + private void ProcessExtraMorph(FacialOtherMorph morph) { foreach (var property in morph.BindProperties) { diff --git a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs index a548c8e..ccc65ca 100644 --- a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs +++ b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs @@ -19,7 +19,7 @@ namespace Gallop } [System.Serializable] - public class FacialExtraMorph : FacialMorph + public class FacialOtherMorph : FacialMorph { public GameObject BindGameObject; public List BindProperties = new List();