diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 0bb86e3..83d161c 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -2938,8 +2938,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -0.5, y: 242} - m_SizeDelta: {x: -85, y: 30} + m_AnchoredPosition: {x: 0, y: 242} + m_SizeDelta: {x: -80, y: 35} m_Pivot: {x: 0.5, y: 1} --- !u!114 &212377233 MonoBehaviour: @@ -20340,7 +20340,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1882365342} m_Direction: 2 m_Value: 1 - m_Size: 0.9787176 + m_Size: 0.9787175 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -40710,8 +40710,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -0.5, y: 201} - m_SizeDelta: {x: -85, y: 30} + m_AnchoredPosition: {x: 0, y: 201} + m_SizeDelta: {x: -80, y: 35} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667641514016 MonoBehaviour: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 19eeaed..a599caa 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -170,7 +170,7 @@ public class UmaViewerBuilder : MonoBehaviour //Load Physics foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/clothes"))) { - if (asset1.Name.Contains("cloth00")) + if (asset1.Name.Contains("cloth04")) RecursiveLoadAsset(asset1); } } @@ -961,12 +961,10 @@ public class UmaViewerBuilder : MonoBehaviour } else if (clip.name.Contains("face")) { - if (CurrentUMAContainer.FaceDrivenKeyTarget) - { - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - CurrentUMAContainer.FaceOverrideController["clip_1"] = clip; - } - + if (CurrentUMAContainer.IsMini) return; + + CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + CurrentUMAContainer.FaceOverrideController["clip_1"] = clip; CurrentUMAContainer.isAnimatorControl = true; CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 0, 0); }