*misc

2 files changed, 100 insertions, 4 deletions

diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
index db86e69f..17897966 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
-  m_Name: Frank_RPG_Assassin_Combo02_1
+  m_Name: Frank_RPG_Assassin_Combo02_1(Clone)
   m_EditorClassIdentifier: 
   animationName: Frank_RPG_Assassin_Combo02_1
   animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim
@@ -18,6 +18,7 @@ MonoBehaviour:
   - {fileID: 114964882930719632}
   - {fileID: 114533364586825402}
   - {fileID: 114167633906909970}
+  - {fileID: 114515573352841980}
   hurtBoxes: []
   hitBoxes:
   - collider:
@@ -26,6 +27,12 @@ MonoBehaviour:
       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: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-white-3.prefab
@@ -65,6 +72,12 @@ MonoBehaviour:
       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: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab
@@ -160,9 +173,17 @@ MonoBehaviour:
   posOffset: {x: 0, y: 1, z: 0}
   rotation: {x: 0, y: 0, z: 0}
   scale: {x: 1, y: 1, z: 1}
-  lifeTime: 0
+  lifeTime: 3
   moveType: 0
-  velocity: {x: 1, y: 0, z: 0}
+  velocity: {x: 5, y: 0, z: 0}
+  acceleration: {x: 0, y: 0, z: 0}
+  curvePath: 
+  speedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
   towardDirection: 0
   sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
   hitResponse: 0
@@ -190,6 +211,49 @@ MonoBehaviour:
   lifeTime: 0
   moveType: 0
   velocity: {x: 1, y: 0, z: 0}
+  acceleration: {x: 0, y: 0, z: 0}
+  curvePath: 
+  speedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  towardDirection: 0
+  sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
+  hitResponse: 0
+--- !u!114 &114515573352841980
+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: 75c54c029c766614590737d26471b7a4, type: 3}
+  m_Name: EventProjectile
+  m_EditorClassIdentifier: 
+  startFrame: 11
+  name: 
+  tag: 
+  projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab
+  attachedToBone: 0
+  bone: 
+  posOffset: {x: 0, y: 1, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 1, y: 1, z: 1}
+  lifeTime: 3
+  moveType: 0
+  velocity: {x: 5, y: 0, z: 0}
+  acceleration: {x: 0, y: 0, z: 0}
+  curvePath: 
+  speedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
   towardDirection: 0
   sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
   hitResponse: 0
@@ -236,6 +300,14 @@ MonoBehaviour:
   lifeTime: 0
   moveType: 0
   velocity: {x: 1, y: 0, z: 0}
+  acceleration: {x: 0, y: 0, z: 0}
+  curvePath: 
+  speedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
   towardDirection: 0
   sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
   hitResponse: 0
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
index 550ad6ee..b372229a 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
@@ -588,10 +588,34 @@ MonoBehaviour:
   rotation: {x: 0, y: 0, z: 0}
   scale: {x: 0, y: 0, z: 0}
   lifeTime: 0
-  moveType: 0
+  moveType: 1
   velocity: {x: 0, y: 0, z: 0}
   acceleration: {x: 0, y: -10, z: 0}
   curvePath: 
+  speedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
   towardDirection: 0
   sparkPath: 
   hitResponse: 0