diff --git a/Assets/Resources/Controller.controller b/Assets/Resources/Controller.controller index 9c7d08b..ef5b7dd 100644 --- a/Assets/Resources/Controller.controller +++ b/Assets/Resources/Controller.controller @@ -51,7 +51,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: motion_s + m_Name: motion_e m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -140,19 +140,19 @@ AnimatorController: m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: next m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: next_s m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -229,7 +229,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: motion_s m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -288,7 +288,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.2 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 1 diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 2df1dd4..3927a71 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -4237,6 +4237,10 @@ PrefabInstance: propertyPath: m_Name value: Picker 2.0 objectReference: {fileID: 0} + - target: {fileID: 157272, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 11423364, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: Setup.ShowHsv value: 0 @@ -9856,7 +9860,7 @@ Light: serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 1, g: 0.972549, b: 0.8901961, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -12030,7 +12034,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1882365342} m_Direction: 2 m_Value: 1 - m_Size: 0.5800894 + m_Size: 0.58008933 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 752083c..b34fe3b 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -843,6 +843,7 @@ public class UmaViewerBuilder : MonoBehaviour RecursiveLoadAsset(motion_e); RecursiveLoadAsset(motion_s); } + CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"]; var lastTime = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime; CurrentUMAContainer.UmaAnimator.Play("motion_1", 0, lastTime); @@ -894,5 +895,5 @@ public class UmaViewerBuilder : MonoBehaviour UI.LoadedAssetsClear(); } - + } diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index de3a682..0a66f69 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -31,7 +31,6 @@ public class UmaViewerMain : MonoBehaviour { Instance = this; Application.targetFrameRate = -1; - if (!Application.isEditor) Debug.unityLogger.logEnabled = false; AbList = UmaDatabaseController.Instance.MetaEntries.ToList(); }