*projectile

2 files changed, 74 insertions, 2 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 f58aa9ca..aed0b017 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(Clone)
+  m_Name: Frank_RPG_Assassin_Combo02_1
   m_EditorClassIdentifier: 
   animationName: Frank_RPG_Assassin_Combo02_1
   animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
index 8248beda..5720259f 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.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_2
+  m_Name: Frank_RPG_Assassin_Combo02_2(Clone)
   m_EditorClassIdentifier: 
   animationName: Frank_RPG_Assassin_Combo02_2
   animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_2.anim
@@ -18,6 +18,9 @@ MonoBehaviour:
   - {fileID: 114347121473010800}
   - {fileID: 114766687553299966}
   - {fileID: 114312737581800856}
+  - {fileID: 114376026760716050}
+  - {fileID: 114330056635207858}
+  - {fileID: 114201303160775736}
   hurtBoxes: []
   hitBoxes:
   - collider:
@@ -175,6 +178,29 @@ MonoBehaviour:
   parameters:
     m_keys: 
     m_values: []
+--- !u!114 &114201303160775736
+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: 12
+  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}
+  velocity: {x: 1, y: 0, z: 0}
+  towardDirection: 0
+  hitResponse: 0
+  sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
 --- !u!114 &114312737581800856
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -194,6 +220,29 @@ MonoBehaviour:
   position: {x: 0, y: -0.5, z: 0}
   rotation: {x: 0, y: 0, z: -30}
   scale: {x: 0.8, y: 0.8, z: 0.8}
+--- !u!114 &114330056635207858
+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: 6
+  projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab
+  attachedToBone: 0
+  bone: 
+  posOffset: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 1, y: 1, z: 1}
+  velocity: {x: 1, y: 0, z: 0}
+  towardDirection: 0
+  hitResponse: 0
+  sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
 --- !u!114 &114347121473010800
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -213,6 +262,29 @@ MonoBehaviour:
   position: {x: 0, y: 0, z: 0}
   rotation: {x: -20, y: 0, z: 0}
   scale: {x: 0.8, y: 0.8, z: -0.8}
+--- !u!114 &114376026760716050
+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: 2
+  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}
+  velocity: {x: 1, y: 0, z: 0}
+  towardDirection: 0
+  hitResponse: 0
+  sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
 --- !u!114 &114766687553299966
 MonoBehaviour:
   m_ObjectHideFlags: 0