diff --git a/Assets/Animations/EnemyAnimationController.controller b/Assets/Animations/EnemyAnimationController.controller index e05115f0..5251511b 100644 --- a/Assets/Animations/EnemyAnimationController.controller +++ b/Assets/Animations/EnemyAnimationController.controller @@ -12,7 +12,6 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 3552691702041008167} - - {fileID: -5865725810896185094} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -28,7 +27,29 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-5865725810896185094 +--- !u!1101 &-7355565198356877363 +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: 8846385207969213533} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8557693 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6146543620670552976 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -47,8 +68,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.8584906 - m_HasExitTime: 1 + m_ExitTime: 0.75 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -70,16 +91,20 @@ AnimatorStateMachine: m_Position: {x: 290, y: 180, z: 0} - serializedVersion: 1 m_State: {fileID: -2487449162152911812} - m_Position: {x: -210, y: 350, z: 0} + m_Position: {x: -220, y: 350, z: 0} - serializedVersion: 1 m_State: {fileID: 4717780193306342999} m_Position: {x: -220, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8846385207969213533} + m_Position: {x: -220, y: 80, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -6146543620670552976} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: -190, y: 270, z: 0} + m_AnyStatePosition: {x: -200, y: 270, 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} @@ -275,7 +300,8 @@ AnimatorState: m_Name: Die m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -7355565198356877363} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -291,6 +317,55 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &7571880184799686224 +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: 8846385207969213533} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &8846385207969213533 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Death Loop + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7571880184799686224} + 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: 2473861289378347930, guid: c1982a19fac5e77439ec3efd79eeace2, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &8997152603305261974 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/External_Used/Animations/Death_Default.fbx b/Assets/External_Used/Animations/Death_Default.fbx index e23e9eed..cced09da 100644 Binary files a/Assets/External_Used/Animations/Death_Default.fbx and b/Assets/External_Used/Animations/Death_Default.fbx differ diff --git a/Assets/External_Used/Animations/Death_Default.fbx.meta b/Assets/External_Used/Animations/Death_Default.fbx.meta index 41868cc8..6bf57844 100644 --- a/Assets/External_Used/Animations/Death_Default.fbx.meta +++ b/Assets/External_Used/Animations/Death_Default.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c1982a19fac5e77439ec3efd79eeace2 +guid: dce2c044329372a439fffb8c2850a005 ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] @@ -33,10 +33,10 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: A_MOD_SWD_Death_B_Pose_Neut - takeName: A_MOD_SWD_Death_B_Pose_Neut - internalID: 2473861289378347930 - firstFrame: 52 + name: A_MOD_SWD_Death_B_Neut + takeName: A_MOD_SWD_Death_B_Neut + internalID: 8003560683512829103 + firstFrame: 1 lastFrame: 53 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/External_Used/Animations/Death_Default_Loop.fbx b/Assets/External_Used/Animations/Death_Default_Loop.fbx new file mode 100644 index 00000000..e23e9eed Binary files /dev/null and b/Assets/External_Used/Animations/Death_Default_Loop.fbx differ diff --git a/Assets/External_Used/Animations/Death_Pose_Default.fbx.meta b/Assets/External_Used/Animations/Death_Default_Loop.fbx.meta similarity index 99% rename from Assets/External_Used/Animations/Death_Pose_Default.fbx.meta rename to Assets/External_Used/Animations/Death_Default_Loop.fbx.meta index 6bf57844..234c33b6 100644 --- a/Assets/External_Used/Animations/Death_Pose_Default.fbx.meta +++ b/Assets/External_Used/Animations/Death_Default_Loop.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: dce2c044329372a439fffb8c2850a005 +guid: c1982a19fac5e77439ec3efd79eeace2 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +16,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -33,10 +31,10 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: A_MOD_SWD_Death_B_Neut - takeName: A_MOD_SWD_Death_B_Neut - internalID: 8003560683512829103 - firstFrame: 1 + name: A_MOD_SWD_Death_B_Pose_Neut + takeName: A_MOD_SWD_Death_B_Pose_Neut + internalID: 2473861289378347930 + firstFrame: 52 lastFrame: 53 wrapMode: 0 orientationOffsetY: 0 @@ -44,7 +42,7 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 + loopTime: 1 loopBlend: 0 loopBlendOrientation: 1 loopBlendPositionY: 1 @@ -240,7 +238,7 @@ ModelImporter: weight: 1 maskType: 1 maskSource: {fileID: 31900000, guid: 3daacf102d24acb4aae029057b824d13, type: 2} - additiveReferencePoseFrame: 0 + additiveReferencePoseFrame: 52 isReadable: 0 meshes: lODScreenPercentages: [] @@ -267,6 +265,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 0 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -1549,8 +1550,7 @@ ModelImporter: hasTranslationDoF: 0 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: b9745fea1f5904242a93d6838cb1b985, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: b9745fea1f5904242a93d6838cb1b985, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 diff --git a/Assets/External_Used/Animations/Death_Pose_Default.fbx b/Assets/External_Used/Animations/Death_Pose_Default.fbx deleted file mode 100644 index cced09da..00000000 Binary files a/Assets/External_Used/Animations/Death_Pose_Default.fbx and /dev/null differ