From 23947fb175c5826715825be7ff09b78365425908 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Sun, 6 Nov 2022 12:57:29 +0800 Subject: [PATCH] bug fix --- Assets/Resources/Controller.controller | 35 +++++++++++++++++++++++--- Assets/Scripts/UmaViewerBuilder.cs | 8 ++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/Assets/Resources/Controller.controller b/Assets/Resources/Controller.controller index 5f36967..96a6da2 100644 --- a/Assets/Resources/Controller.controller +++ b/Assets/Resources/Controller.controller @@ -175,7 +175,7 @@ AnimatorController: m_Behaviours: [] m_BlendingMode: 0 m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 + m_DefaultWeight: 1 m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} @@ -243,7 +243,10 @@ AnimatorStateMachine: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Tail Layer - m_ChildStates: [] + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 7645721988896293745} + m_Position: {x: 330, y: 200, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -253,7 +256,7 @@ AnimatorStateMachine: 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} + m_DefaultState: {fileID: 7645721988896293745} --- !u!1101 &2501757138902606358 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -350,3 +353,29 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &7645721988896293745 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3760a5527a1ec5c4884ec081fbcc6542, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 51c0ed0..574efdf 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -954,6 +954,7 @@ public class UmaViewerBuilder : MonoBehaviour RecursiveLoadAsset(motion_s); } + SetPreviewCamera(null); var lastTime = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime; CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"]; CurrentUMAContainer.OverrideController["clip_2"] = clip; @@ -967,8 +968,11 @@ public class UmaViewerBuilder : MonoBehaviour else if (clip.name.Contains("tail")) { if (CurrentUMAContainer.IsMini) return; + var currentStateInfo = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0); + CurrentUMAContainer.UmaAnimator.Rebind(); CurrentUMAContainer.OverrideController["clip_t"] = clip; - CurrentUMAContainer.UmaAnimator.Play("motion_1", 1); + CurrentUMAContainer.UmaAnimator.Play("motion_t", 1 ,0); + CurrentUMAContainer.UmaAnimator.Play(currentStateInfo.shortNameHash, 0, currentStateInfo.normalizedTime); } else if (clip.name.Contains("face")) { @@ -1002,6 +1006,7 @@ public class UmaViewerBuilder : MonoBehaviour var facialMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_face")); var cameraMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_cam")); var earMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_ear")); + if (facialMotion != null) { RecursiveLoadAsset(facialMotion); @@ -1022,7 +1027,6 @@ public class UmaViewerBuilder : MonoBehaviour SetPreviewCamera(null); } CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0); - CurrentUMAContainer.OverrideController["clip_2"].wrapMode = WrapMode.Loop; CurrentUMAContainer.TrackTarget = PreviewCamera.gameObject; } else