diff --git a/Assets/Resources/Camera Controller.controller b/Assets/Resources/Camera Controller.controller index 1f453b6..01328a8 100644 --- a/Assets/Resources/Camera Controller.controller +++ b/Assets/Resources/Camera Controller.controller @@ -1,27 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-4072449279223152736 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1046042063806159501} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-1046042063806159501 AnimatorState: serializedVersion: 6 @@ -32,8 +10,7 @@ AnimatorState: m_Name: motion_1 m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -4072449279223152736} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index d5f7a87..e8fe7c1 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -974,7 +974,7 @@ public class UmaViewerBuilder : MonoBehaviour var lastTime = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime; CurrentUMAContainer.OverrideController["clip_2"] = clip; // If Cut-in, play immediately without state interpolation - if (clip.name.Contains("crd")) + if (clip.name.Contains("crd") || clip.name.Contains("res_chr")) { var facialMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_face")); var cameraMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_cam"));