*misc

6 files changed, 114 insertions, 12 deletions

diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset
index 95993aa8..cfd7918c 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
-  m_Name: Air_Combo03_Z0_4(Clone)
+  m_Name: Air_Combo03_Z0_4
   m_EditorClassIdentifier: 
   animationName: Air_Combo03_Z0_4
   animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_4.anim
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Combo4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Combo4.asset
new file mode 100644
index 00000000..1b399978
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Combo4.asset
@@ -0,0 +1,46 @@
+%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: Combo4
+  m_EditorClassIdentifier: 
+  animationName: Combo4
+  animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Combo4.anim
+  animationEvents: []
+  hurtBoxes: []
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
+  curve:
+    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
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Combo4.asset.meta b/Assets/Bundle/Unit/PC/Erika/AnimationData/Combo4.asset.meta
new file mode 100644
index 00000000..d1821cc9
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Combo4.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7570020645f11a946a824514084e6468
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Gun.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Gun.asset
index 115971a4..0a709ddb 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Gun.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Gun.asset
@@ -10,14 +10,20 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
-  m_Name: Gun
+  m_Name: Gun(Clone)
   m_EditorClassIdentifier: 
   animationName: Gun
   animationPath: Assets/Art/Animations/Erika/Gun.anim
   animationEvents: []
   hurtBoxes:
-  - type: 1
-    pivot: 0
+  - collider:
+      type: 0
+      pivot: 0
+      useGravity: 0
+      hitBack: {x: 0, y: 0, z: 0}
+      multiHit: 0
+      sparkPath: 
+      multiple: 0
     frames:
     - frame: 0
       active: 1
@@ -31,3 +37,27 @@ MonoBehaviour:
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
+  curve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1.5
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1.5
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
index 531575bc..3334e1b5 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
@@ -180,21 +180,39 @@ MonoBehaviour:
     m_Curve:
     - serializedVersion: 3
       time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
+      value: 1.1
+      inSlope: -2.0588236
+      outSlope: -2.0588236
       tangentMode: 34
       weightedMode: 0
       inWeight: 0
-      outWeight: 0
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.34
+      value: 0.4
+      inSlope: Infinity
+      outSlope: Infinity
+      tangentMode: 103
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.14564696
+    - serializedVersion: 3
+      time: 0.38
+      value: 1.1
+      inSlope: 7.8783245
+      outSlope: Infinity
+      tangentMode: 97
+      weightedMode: 0
+      inWeight: 0.04345105
+      outWeight: 0.33333334
     - serializedVersion: 3
       time: 1
-      value: 1
+      value: 1.1
       inSlope: 0
       outSlope: 0
       tangentMode: 34
       weightedMode: 0
-      inWeight: 0
+      inWeight: 0.33333334
       outWeight: 0
     m_PreInfinity: 2
     m_PostInfinity: 2
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller
index 67dd8b1b..83e2ad4b 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller
+++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller
@@ -65,7 +65,7 @@ AnimatorController:
     m_Controller: {fileID: 0}
   - m_Name: IdleStatus
     m_Type: 1
-    m_DefaultFloat: 0
+    m_DefaultFloat: 0.4
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
@@ -901,7 +901,7 @@ AnimatorStateMachine:
   m_ChildStateMachines:
   - serializedVersion: 1
     m_StateMachine: {fileID: 1107282701554374512}
-    m_Position: {x: 612, y: -756, z: 0}
+    m_Position: {x: 612, y: -780, z: 0}
   m_AnyStateTransitions: []
   m_EntryTransitions: []
   m_StateMachineTransitions: {}