diff --git a/Assets/Resources/Controller.controller b/Assets/Resources/Controller.controller index fb7cad8..5f36967 100644 --- a/Assets/Resources/Controller.controller +++ b/Assets/Resources/Controller.controller @@ -167,6 +167,18 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Tail Layer + m_StateMachine: {fileID: 2493255104703599953} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} --- !u!1107 &1917244892325702502 AnimatorStateMachine: serializedVersion: 6 @@ -223,6 +235,25 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1107 &2493255104703599953 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Tail Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} --- !u!1101 &2501757138902606358 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Resources/Face Controller.controller b/Assets/Resources/Face Controller.controller index b8869eb..8afac93 100644 --- a/Assets/Resources/Face Controller.controller +++ b/Assets/Resources/Face Controller.controller @@ -176,7 +176,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: ad7fc1d5eece1a946a437cd1bb81bf90, type: 2} + m_Motion: {fileID: 7400000, guid: 3ea5c07300fddb0428f90a5f85f22ee5, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/clip_t.anim b/Assets/Resources/clip_t.anim new file mode 100644 index 0000000..cef5fc4 --- /dev/null +++ b/Assets/Resources/clip_t.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: clip_t + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/clip_t.anim.meta b/Assets/Resources/clip_t.anim.meta new file mode 100644 index 0000000..28a7219 --- /dev/null +++ b/Assets/Resources/clip_t.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3760a5527a1ec5c4884ec081fbcc6542 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 9996c10..51c0ed0 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -964,6 +964,12 @@ public class UmaViewerBuilder : MonoBehaviour CurrentUMAContainer.isAnimatorControl = false; CurrentUMAContainer.TrackTarget = Camera.main.gameObject; } + else if (clip.name.Contains("tail")) + { + if (CurrentUMAContainer.IsMini) return; + CurrentUMAContainer.OverrideController["clip_t"] = clip; + CurrentUMAContainer.UmaAnimator.Play("motion_1", 1); + } else if (clip.name.Contains("face")) { if (CurrentUMAContainer.IsMini) return;