Midair Animation Added

4 years ago · c33da6ab64
parent 320575a27c
commit c33da6ab64
8 changed files with 319 additions and 21 deletions
--- a/MuseumGame/Assets/Animations/Player
+++ b/MuseumGame/Assets/Animations/Player
@ -0,0 +1,107 @@
+%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: Player Jump Midair v1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -9138703426282500021, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.083333336
+      value: {fileID: 429644503569667005, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.16666667
+      value: {fileID: -1442490000430059858, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.25
+      value: {fileID: -7868241686654605716, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.33333334
+      value: {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.41666666
+      value: {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.5
+      value: {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.5833333
+      value: {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.6666667
+      value: {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.75
+      value: {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.8333333
+      value: {fileID: 1540433061672771331, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.9166667
+      value: {fileID: -5324470790269307012, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 1
+      value: {fileID: -3023117061024659501, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 1.0833334
+      value: {fileID: 5481875011490478117, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -9138703426282500021, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: 429644503569667005, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -1442490000430059858, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -7868241686654605716, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: 1540433061672771331, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -5324470790269307012, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -3023117061024659501, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: 5481875011490478117, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.1666667
+    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: []
--- a/MuseumGame/Assets/Animations/Player
+++ b/MuseumGame/Assets/Animations/Player
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: edf6d650d401cee4c832d08bf32f61df
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MuseumGame/Assets/Animations/Protagonist
+++ b/MuseumGame/Assets/Animations/Protagonist
@ -20,14 +20,12 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - time: 0.083333336
      value: {fileID: 1540433061672771331, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - time: 0.16666667
+    - time: 0.083333336
      value: {fileID: -5324470790269307012, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - time: 0.25
+    - time: 0.16666667
      value: {fileID: -3023117061024659501, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - time: 0.33333334
+    - time: 0.25
      value: {fileID: 5481875011490478117, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    attribute: m_Sprite
    path: 
@ -48,7 +46,6 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
-    - {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    - {fileID: 1540433061672771331, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    - {fileID: -5324470790269307012, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    - {fileID: -3023117061024659501, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
@ -58,12 +55,12 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.41666666
+    m_StopTime: 0.33333334
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/MuseumGame/Assets/Animations/Protagonist
+++ b/MuseumGame/Assets/Animations/Protagonist
@ -0,0 +1,74 @@
+%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: Protagonist Jump Midair v1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.083333336
+      value: {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - time: 0.16666667
+      value: {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+    - {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.25
+    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: []
--- a/MuseumGame/Assets/Animations/Protagonist
+++ b/MuseumGame/Assets/Animations/Protagonist
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c45f2a246c84bfc4cbb65d242a7eb6d5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MuseumGame/Assets/Animations/Protagonist
+++ b/MuseumGame/Assets/Animations/Protagonist
@ -27,10 +27,6 @@ AnimationClip:
      value: {fileID: -1442490000430059858, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    - time: 0.25
      value: {fileID: -7868241686654605716, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - time: 0.33333334
-      value: {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - time: 0.41666666
-      value: {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
@ -54,19 +50,17 @@ AnimationClip:
    - {fileID: 429644503569667005, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    - {fileID: -1442490000430059858, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
    - {fileID: -7868241686654605716, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - {fileID: -472527136499386539, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
-    - {fileID: 8667279835780202195, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.5
+    m_StopTime: 0.33333334
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/MuseumGame/Assets/Animations/Protagonist
+++ b/MuseumGame/Assets/Animations/Protagonist
@ -50,6 +50,33 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1102 &-8213815713097873068
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Midair
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 3056341785605120140}
+  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: c45f2a246c84bfc4cbb65d242a7eb6d5, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &-7559702859962622124
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -84,7 +111,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 3754640667882315008}
-  - {fileID: -3874732199687805077}
+  - {fileID: 8015505733455602002}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -198,13 +225,16 @@ AnimatorStateMachine:
    m_Position: {x: 80, y: 160, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -7548201986605107798}
-    m_Position: {x: 350, y: 160, z: 0}
+    m_Position: {x: 350, y: 240, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 3480931448333261977}
-    m_Position: {x: 350, y: 70, z: 0}
+    m_Position: {x: 350, y: 30, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -1431828175096590247}
    m_Position: {x: 600, y: 110, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8213815713097873068}
+    m_Position: {x: 350, y: 130, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@ -362,7 +392,35 @@ AnimatorStateTransition:
  m_TransitionDuration: 0.25
  m_TransitionOffset: 0
  m_ExitTime: 0.75
-  m_HasExitTime: 1
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &3056341785605120140
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 4
+    m_ConditionEvent: velocityY
+    m_EventTreshold: 0
+  - m_ConditionMode: 1
+    m_ConditionEvent: isGrounded
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3480931448333261977}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
@ -456,6 +514,9 @@ AnimatorStateTransition:
  - m_ConditionMode: 1
    m_ConditionEvent: isGliding
    m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: isGrounded
+    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: -1431828175096590247}
  m_Solo: 0
@ -516,7 +577,7 @@ AnimatorStateTransition:
  m_TransitionDuration: 0.25
  m_TransitionOffset: 0
  m_ExitTime: 0.75
-  m_HasExitTime: 1
+  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
@ -546,6 +607,34 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &8015505733455602002
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 3
+    m_ConditionEvent: velocityY
+    m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: isGrounded
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -8213815713097873068}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.5
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &8064295483439524213
 AnimatorState:
  serializedVersion: 6
--- a/MuseumGame/UserSettings/EditorUserSettings.asset
+++ b/MuseumGame/UserSettings/EditorUserSettings.asset
@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!162 &1
+EditorUserSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 4
+  m_ConfigSettings:
+    vcSharedLogLevel:
+      value: 0d5e400f0650
+      flags: 0
+  m_VCAutomaticAdd: 1
+  m_VCDebugCom: 0
+  m_VCDebugCmd: 0
+  m_VCDebugOut: 0
+  m_SemanticMergeMode: 2
+  m_VCShowFailedCheckout: 1
+  m_VCOverwriteFailedCheckoutAssets: 1
+  m_VCProjectOverlayIcons: 1
+  m_VCHierarchyOverlayIcons: 1
+  m_VCOtherOverlayIcons: 1
+  m_VCAllowAsyncUpdate: 1