diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 42f80c1..e707efe 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -227,12 +227,9 @@ public class UmaViewerBuilder : MonoBehaviour { var firsehead = CurrentContainer.Heads[0]; var FaceDriven = firsehead.GetComponent()._assetTable.list.Find(a => { return a.Key == "facial_target"; }).Value as FaceDrivenKeyTarget; - var newFaceDriven = firsehead.AddComponent(); - newFaceDriven.callBack = UmaViewerUI.Instance; - newFaceDriven._eyebrowTarget = FaceDriven._eyebrowTarget; - newFaceDriven._eyeTarget = FaceDriven._eyeTarget; - newFaceDriven._mouthTarget = FaceDriven._mouthTarget; - CurrentContainer.FaceDrivenKeyTargets = newFaceDriven; + CurrentContainer.FaceDrivenKeyTargets = FaceDriven; + FaceDriven.callBack = UmaViewerUI.Instance; + FaceDriven.Initialize(firsehead.GetComponentsInChildren().ToList()); } LoadAsset(UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name.EndsWith($"anm_eve_chr{id}_00_idle01_loop"))); diff --git a/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs index 0dc5411..452232b 100644 --- a/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs @@ -5,13 +5,13 @@ using UnityEngine; namespace Gallop { - public class FaceDrivenKeyTarget : MonoBehaviour + public class FaceDrivenKeyTarget : ScriptableObject { public List _eyeTarget; public List _eyebrowTarget; public List _mouthTarget; - public List Objs = new List(); + public List Objs; private FacialMorph BaseLEyeBrowMorph, BaseREyeBrowMorph; private FacialMorph BaseLEyeMorph, BaseREyeMorph; private FacialMorph BaseMouthMorph; @@ -21,10 +21,9 @@ namespace Gallop public List MouthMorphs = new List(); public FaceLoadCallBack callBack; - private void Start() + public void Initialize(List objs) { - - Objs.AddRange(GetComponentsInChildren()); + Objs = objs; for (int i = 0; i < _eyebrowTarget.Count; i++) { diff --git a/Assets/Scripts/umamusume/LiveTimelineWorkSheet.cs b/Assets/Scripts/umamusume/LiveTimelineWorkSheet.cs index 9866ea6..e1df4e9 100644 --- a/Assets/Scripts/umamusume/LiveTimelineWorkSheet.cs +++ b/Assets/Scripts/umamusume/LiveTimelineWorkSheet.cs @@ -2,7 +2,7 @@ namespace Gallop.Live.Cutt { - public class LiveTimelineWorkSheet:MonoBehaviour + public class LiveTimelineWorkSheet:ScriptableObject { } diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index a68c22d..d9c596c 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -6244,7 +6244,7 @@ Texture2D: m_MipsStripped: 0 m_TextureFormat: 1 m_MipCount: 1 - m_IsReadable: 0 + m_IsReadable: 1 m_IsPreProcessed: 0 m_IgnoreMasterTextureLimit: 0 m_StreamingMipmaps: 0