*misc

7 files changed, 220 insertions, 5 deletions

diff --git a/Assets/Data/AnimationData/Erika/Dash_With_Sword.asset b/Assets/Data/AnimationData/Erika/Dash_With_Sword.asset
new file mode 100644
index 00000000..3aaae3f9
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Dash_With_Sword.asset
@@ -0,0 +1,41 @@
+%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: Dash_With_Sword
+  m_EditorClassIdentifier: 
+  animationName: Dash_With_Sword
+  animationPath: Assets/Art/Animations/Erika/Dash_With_Sword.anim
+  animationEvents: []
+  hurtBoxes:
+  - type: 1
+    pivot: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.16, z: 0.5}
+    - frame: 2
+      active: 0
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1, z: 0.5}
+    - frame: 11
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 0.93, z: 0.5}
+    - frame: 16
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.15, z: 0.5}
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Dash_With_Sword.asset.meta b/Assets/Data/AnimationData/Erika/Dash_With_Sword.asset.meta
new file mode 100644
index 00000000..7d7287b7
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Dash_With_Sword.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0c6414e823b57f34c9605f08507a1434
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/AnimationData/Erika/Gun.asset b/Assets/Data/AnimationData/Erika/Gun.asset
new file mode 100644
index 00000000..115971a4
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Gun.asset
@@ -0,0 +1,33 @@
+%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: Gun
+  m_EditorClassIdentifier: 
+  animationName: Gun
+  animationPath: Assets/Art/Animations/Erika/Gun.anim
+  animationEvents: []
+  hurtBoxes:
+  - type: 1
+    pivot: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.4, z: 0.5}
+    - frame: 75
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.3, z: 0.5}
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Gun.asset.meta b/Assets/Data/AnimationData/Erika/Gun.asset.meta
new file mode 100644
index 00000000..6d9215f8
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Gun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 14769bf84940ee6418f5a5b163b86f9f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/AnimationData/Erika/Take 001.asset b/Assets/Data/AnimationData/Erika/Take 001.asset
index 904067ac..bb83d93a 100644
--- a/Assets/Data/AnimationData/Erika/Take 001.asset
+++ b/Assets/Data/AnimationData/Erika/Take 001.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
-  m_Name: Take 001(Clone)
+  m_Name: Take 001
   m_EditorClassIdentifier: 
   animationName: Take 001
   animationPath: Assets/Art/Animations/Erika/Take 001.anim
@@ -19,6 +19,7 @@ MonoBehaviour:
   - {fileID: 114589907415780854}
   - {fileID: 114793878721939902}
   - {fileID: 114750047321414068}
+  - {fileID: 114541332933305096}
   hurtBoxes:
   - type: 1
     pivot: 0
@@ -246,7 +247,7 @@ MonoBehaviour:
   m_Name: EventEffect
   m_EditorClassIdentifier: 
   startFrame: 12
-  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 6.prefab
   attached: 0
   bone: 
   position: {x: 0, y: 0, z: 0}
@@ -309,6 +310,26 @@ MonoBehaviour:
   position: {x: 0, y: 0, z: 0}
   rotation: {x: 2.15, y: 0, z: 0}
   scale: {x: 2.39, y: -0.24, z: 0}
+--- !u!114 &114541332933305096
+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: 28
+  projectilePath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+  velocity: {x: 0, y: 0, z: 0}
 --- !u!114 &114550616663341652
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -360,7 +381,7 @@ MonoBehaviour:
   m_Name: EventEffect
   m_EditorClassIdentifier: 
   startFrame: 40
-  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 6.prefab
   attached: 0
   bone: 
   position: {x: 0, y: 0, z: 0}
@@ -398,7 +419,7 @@ MonoBehaviour:
   m_Name: EventEffect
   m_EditorClassIdentifier: 
   startFrame: 49
-  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 6.prefab
   attached: 0
   bone: 
   position: {x: 0, y: 0, z: 0}
@@ -417,7 +438,7 @@ MonoBehaviour:
   m_Name: EventEffect
   m_EditorClassIdentifier: 
   startFrame: 44
-  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 6.prefab
   attached: 0
   bone: 
   position: {x: 0, y: 0, z: 0}
diff --git a/Assets/Data/RootMotionData/Erika/Gun.asset b/Assets/Data/RootMotionData/Erika/Gun.asset
new file mode 100644
index 00000000..a6f51472
--- /dev/null
+++ b/Assets/Data/RootMotionData/Erika/Gun.asset
@@ -0,0 +1,96 @@
+%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: b3a20e0c1a718a24f8d14eed06ad5bad, type: 3}
+  m_Name: Gun
+  m_EditorClassIdentifier: 
+  animationName: Gun
+  frameCount: 77
+  positionList:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: 0, z: 0.015877742}
+  - {x: 0, y: 0, z: 0.031764824}
+  - {x: 0, y: 0, z: 0.05248629}
+  - {x: 0, y: 0, z: 0.066815995}
+  - {x: 0, y: 0, z: 0.07944158}
+  - {x: 0, y: 0, z: 0.09300017}
+  - {x: 0, y: 0, z: 0.10022116}
+  - {x: 0, y: 0, z: 0.10441136}
+  - {x: 0, y: 0, z: 0.10342379}
+  - {x: 0, y: 0, z: 0.093310416}
+  - {x: 0, y: 0, z: 0.0264975}
+  - {x: 0, y: 0, z: -0.00781928}
+  - {x: 0, y: 0, z: -0.011456327}
+  - {x: 0, y: 0, z: -0.018479021}
+  - {x: 0, y: 0, z: -0.026720688}
+  - {x: 0, y: 0, z: -0.027173236}
+  - {x: 0, y: 0, z: -0.018420244}
+  - {x: 0, y: 0, z: 0.009493982}
+  - {x: 0, y: 0, z: 0.034965526}
+  - {x: 0, y: 0, z: 0.04942392}
+  - {x: 0, y: 0, z: 0.020010376}
+  - {x: 0, y: 0, z: -0.023859162}
+  - {x: 0, y: 0, z: -0.04193788}
+  - {x: 0, y: 0, z: -0.05214958}
+  - {x: 0, y: 0, z: -0.05720008}
+  - {x: 0, y: 0, z: -0.07766398}
+  - {x: 0, y: 0, z: -0.0992602}
+  - {x: 0, y: 0, z: -0.10637844}
+  - {x: 0, y: 0, z: -0.1056621}
+  - {x: 0, y: 0, z: -0.10060139}
+  - {x: 0, y: 0, z: -0.09483961}
+  - {x: 0, y: 0, z: -0.088943526}
+  - {x: 0, y: 0, z: -0.08196541}
+  - {x: 0, y: 0, z: -0.10778221}
+  - {x: 0, y: 0, z: -0.13029236}
+  - {x: 0, y: 0, z: -0.15001838}
+  - {x: 0, y: 0, z: -0.14984803}
+  - {x: 0, y: 0, z: -0.14656417}
+  - {x: 0, y: 0, z: -0.13934086}
+  - {x: 0, y: 0, z: -0.13348377}
+  - {x: 0, y: 0, z: -0.1287803}
+  - {x: 0, y: 0, z: -0.06926894}
+  - {x: 0, y: 0, z: -0.025635265}
+  - {x: 0, y: 0, z: 0.0046394775}
+  - {x: 0, y: 0, z: 0.06301785}
+  - {x: 0, y: 0, z: 0.12915054}
+  - {x: 0, y: 0, z: 0.19617428}
+  - {x: 0, y: 0, z: 0.24748409}
+  - {x: 0, y: 0, z: 0.24794446}
+  - {x: 0, y: 0, z: 0.22291908}
+  - {x: 0, y: 0, z: 0.17628278}
+  - {x: 0, y: 0, z: 0.15231659}
+  - {x: 0, y: 0, z: 0.14222986}
+  - {x: 0, y: 0, z: 0.13379933}
+  - {x: 0, y: 0, z: 0.12993667}
+  - {x: 0, y: 0, z: 0.12745836}
+  - {x: 0, y: 0, z: 0.12556247}
+  - {x: 0, y: 0, z: 0.124880016}
+  - {x: 0, y: 0, z: 0.12425579}
+  - {x: 0, y: 0, z: 0.12295337}
+  - {x: 0, y: 0, z: 0.121097855}
+  - {x: 0, y: 0, z: -0.0117618255}
+  - {x: 0, y: 0, z: -0.14985698}
+  - {x: 0, y: 0, z: -0.19055155}
+  - {x: 0, y: 0, z: -0.22130531}
+  - {x: 0, y: 0, z: -0.24559088}
+  - {x: 0, y: 0, z: -0.24534898}
+  - {x: 0, y: 0, z: -0.2415631}
+  - {x: 0, y: 0, z: -0.23251384}
+  - {x: 0, y: 0, z: -0.22337069}
+  - {x: 0, y: 0, z: -0.21367677}
+  - {x: 0, y: 0, z: -0.20133258}
+  - {x: 0, y: 0, z: -0.1936874}
+  - {x: 0, y: 0, z: -0.16234723}
+  - {x: 0, y: 0, z: -0.11855407}
+  - {x: 0, y: 0, z: -0.08628435}
+  animationLength: 2.5333335
+  fps: 30
diff --git a/Assets/Data/RootMotionData/Erika/Gun.asset.meta b/Assets/Data/RootMotionData/Erika/Gun.asset.meta
new file mode 100644
index 00000000..e9a0d25f
--- /dev/null
+++ b/Assets/Data/RootMotionData/Erika/Gun.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ba1f20af61bd9ad46b436755f97bab3b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: