*air combo

4 files changed, 217 insertions, 1 deletions

diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller
index 4bdb4fe2..17c21491 100644
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller
@@ -392,6 +392,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &1102330666141802932
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HitInAir
+  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: 1
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: c3547ad0b45d2f849a8c682ac5e4e2ba, type: 2}
+  m_Tag: 
+  m_SpeedParameter: PlaybackSpeed0
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102385235525877490
 AnimatorState:
   serializedVersion: 5
@@ -776,6 +802,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 1102634479990241134}
     m_Position: {x: 420, y: -204, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102330666141802932}
+    m_Position: {x: 420, y: -144, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air02.asset b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air02.asset
new file mode 100644
index 00000000..468b948e
--- /dev/null
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air02.asset
@@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
+  m_Name: hit_air02
+  m_EditorClassIdentifier: 
+  animationName: hit_air02
+  animationPath: Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/hit_air02.anim
+  animationEvents: []
+  hurtBoxes:
+  - collider:
+      type: 1
+      pivot: 0
+      multiHit: 0
+      hitResponse: 0
+      hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      freezeFramesSelf: 0
+      freezeFramesOther: 0
+      sparkPath: 
+      sparkAnchor: 0
+      sparkOffset: {x: 0, y: 0, z: 0}
+      sparkScale: {x: 1, y: 1, z: 1}
+      multiSparks: 0
+      spark2Path: 
+      spark2Anchor: 0
+      spark2Offset: {x: 0, y: 0, z: 0}
+      spark3Path: 
+      spark3Anchor: 0
+      spark3Offset: {x: 0, y: 0, z: 0}
+      selfEffect: 0
+      otherEffect: 0
+      zoomCamera: 0
+      shakeScreen: 0
+      shakeOffset: {x: 0, y: 0}
+      shakeStrength: 0
+      colorDrift: 0
+      blur: 0
+      soundPath: 
+      useGravity: 0
+      multiple: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0.19, y: 0, z: 0}
+      size: {x: 2.1, y: 0.82, z: 1}
+    - frame: 1
+      active: 1
+      position: {x: 0.18, y: 0, z: 0}
+      size: {x: 1.58, y: 1.43, z: 1}
+    - frame: 11
+      active: 1
+      position: {x: 0, y: -0.37, z: 0}
+      size: {x: 1.78, y: 1, z: 1}
+    - frame: 21
+      active: 1
+      position: {x: 0.24, y: 0, z: 0}
+      size: {x: 2.07, y: 1, z: 1}
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
+  overrideRootMotion: 1
+  rootMotionOverrideData:
+    positions:
+    - position: {x: 0, y: 0, z: 0}
+      frame: 0
+    - position: {x: -0.34, y: 0.24, z: 0}
+      frame: 2
+    - position: {x: -0.68, y: 0.29, z: 0}
+      frame: 4
+    - position: {x: -1.13, y: 0.25, z: 0}
+      frame: 8
+    - position: {x: -1.44, y: 0.18, z: 0}
+      frame: 11
+    - position: {x: -1.73, y: 0.18, z: 0}
+      frame: 15
+    - position: {x: -1.89, y: 0, z: 0}
+      frame: 21
+  speedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  curves:
+    m_keys: 
+    m_values: []
+  toggles:
+    m_keys: 
+    m_values: []
+  parameters:
+    m_keys: 
+    m_values: []
+  properties:
+    m_keys: 
+    m_values: []
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air02.asset.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air02.asset.meta
new file mode 100644
index 00000000..d878bf6a
--- /dev/null
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air02.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cc02ee457f5b98c468b5cacbe7829d0e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset
index d01a9899..d038976e 100644
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset
@@ -15,11 +15,59 @@ MonoBehaviour:
   animationName: hit_air03
   animationPath: Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/hit_air03.anim
   animationEvents: []
-  hurtBoxes: []
+  hurtBoxes:
+  - collider:
+      type: 1
+      pivot: 0
+      multiHit: 0
+      hitResponse: 0
+      hitBack: {x: 0, y: 0, z: 0}
+      hitCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      freezeFramesSelf: 0
+      freezeFramesOther: 0
+      sparkPath: 
+      sparkAnchor: 0
+      sparkOffset: {x: 0, y: 0, z: 0}
+      sparkScale: {x: 1, y: 1, z: 1}
+      multiSparks: 0
+      spark2Path: 
+      spark2Anchor: 0
+      spark2Offset: {x: 0, y: 0, z: 0}
+      spark3Path: 
+      spark3Anchor: 0
+      spark3Offset: {x: 0, y: 0, z: 0}
+      selfEffect: 0
+      otherEffect: 0
+      zoomCamera: 0
+      shakeScreen: 0
+      shakeOffset: {x: 0, y: 0}
+      shakeStrength: 0
+      colorDrift: 0
+      blur: 0
+      soundPath: 
+      useGravity: 0
+      multiple: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0.14, y: -0.44, z: 0}
+      size: {x: 2.2, y: 1.08, z: 1}
+    - frame: 27
+      active: 1
+      position: {x: 0, y: -0.29, z: 0}
+      size: {x: 2.46, y: 1, z: 1}
   hitBoxes: []
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
+  overrideRootMotion: 0
+  rootMotionOverrideData:
+    positions: []
   speedCurve:
     serializedVersion: 2
     m_Curve:
@@ -53,3 +101,6 @@ MonoBehaviour:
   parameters:
     m_keys: 
     m_values: []
+  properties:
+    m_keys: 
+    m_values: []