aboutsummaryrefslogtreecommitdiff
path: root/Assets/Art
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Art')
-rw-r--r--Assets/Art/Animations/Falling To Roll.fbxbin1920464 -> 416320 bytes
-rw-r--r--Assets/Art/Animations/Falling To Roll.fbx.meta8
-rw-r--r--Assets/Art/Animator/Humanoid.controller87
3 files changed, 85 insertions, 10 deletions
diff --git a/Assets/Art/Animations/Falling To Roll.fbx b/Assets/Art/Animations/Falling To Roll.fbx
index 81b2aca..bfd2d73 100644
--- a/Assets/Art/Animations/Falling To Roll.fbx
+++ b/Assets/Art/Animations/Falling To Roll.fbx
Binary files differ
diff --git a/Assets/Art/Animations/Falling To Roll.fbx.meta b/Assets/Art/Animations/Falling To Roll.fbx.meta
index acdfd34..8eae93a 100644
--- a/Assets/Art/Animations/Falling To Roll.fbx.meta
+++ b/Assets/Art/Animations/Falling To Roll.fbx.meta
@@ -24,7 +24,7 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
- animationCompression: 1
+ animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
@@ -93,13 +93,13 @@ ModelImporter:
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
- hasExtraRoot: 0
+ hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
- animationType: 2
+ animationType: 3
humanoidOversampling: 1
- avatarSetup: 0
+ avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
diff --git a/Assets/Art/Animator/Humanoid.controller b/Assets/Art/Animator/Humanoid.controller
index ab72720..23cace1 100644
--- a/Assets/Art/Animator/Humanoid.controller
+++ b/Assets/Art/Animator/Humanoid.controller
@@ -1,5 +1,52 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-6770394831173107770
+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: 7601682898943563198}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8333334
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-5684787726316885536
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Debug_Roll
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 3051980819593247121}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.7494432
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1101 &-2413022822332482909
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -43,11 +90,11 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: DEBUG_Roll
+ - m_Name: Debug_Roll
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
- m_DefaultBool: 0
+ m_DefaultBool: 1
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
@@ -101,6 +148,34 @@ BlendTree:
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 3
+--- !u!1102 &3051980819593247121
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: mixamo_com
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -6770394831173107770}
+ 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: -203655887218126122, guid: 442d2cd7da7e6f947804c626e4014efb,
+ type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &5025552237477777202
AnimatorState:
serializedVersion: 6
@@ -140,10 +215,10 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7601682898943563198}
- m_Position: {x: 30, y: 270, z: 0}
+ m_Position: {x: 350, y: 110, z: 0}
- serializedVersion: 1
- m_State: {fileID: 5025552237477777202}
- m_Position: {x: 330, y: 120, z: 0}
+ m_State: {fileID: 3051980819593247121}
+ m_Position: {x: 360, y: 10, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -165,7 +240,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 8528838308025900624}
+ - {fileID: -5684787726316885536}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0