*misc

4 files changed, 381 insertions, 7 deletions

diff --git a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
index f4fd6c35..fa7ebbd0 100644
--- a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
+++ b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
@@ -35,7 +35,18 @@ MonoBehaviour:
       active: 1
       position: {x: 0, y: 0, z: 0}
       size: {x: 1, y: 1.43, z: 0.5}
-  hitBoxes: []
+  hitBoxes:
+  - type: 0
+    pivot: 1
+    frames:
+    - frame: 9
+      active: 1
+      position: {x: 0, y: 1.21, z: 0.73}
+      size: {x: 1, y: 1.08, z: 0.84}
+    - frame: 13
+      active: 1
+      position: {x: 0, y: 0.97, z: 0.72}
+      size: {x: 1, y: 1.71, z: 0.84}
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Light_Attk_3.asset b/Assets/Data/AnimationData/Erika/Light_Attk_3.asset
new file mode 100644
index 00000000..7cb882f9
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Light_Attk_3.asset
@@ -0,0 +1,28 @@
+%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: Light_Attk_3
+  m_EditorClassIdentifier: 
+  animationName: Light_Attk_3
+  animationPath: Assets/Art/Animations/Erika/Light_Attk_3.anim
+  animationEvents: []
+  hurtBoxes: []
+  hitBoxes:
+  - type: 0
+    pivot: 1
+    frames: []
+  - type: 0
+    pivot: 1
+    frames: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Light_Attk_3.asset.meta b/Assets/Data/AnimationData/Erika/Light_Attk_3.asset.meta
new file mode 100644
index 00000000..1fab36ec
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Light_Attk_3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dfca766948296784e9b2dcb380397e0c
+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 d5ec6661..904067ac 100644
--- a/Assets/Data/AnimationData/Erika/Take 001.asset
+++ b/Assets/Data/AnimationData/Erika/Take 001.asset
@@ -10,11 +10,15 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
-  m_Name: Take 001
+  m_Name: Take 001(Clone)
   m_EditorClassIdentifier: 
   animationName: Take 001
   animationPath: Assets/Art/Animations/Erika/Take 001.anim
-  animationEvents: []
+  animationEvents:
+  - {fileID: 114361324986796640}
+  - {fileID: 114589907415780854}
+  - {fileID: 114793878721939902}
+  - {fileID: 114750047321414068}
   hurtBoxes:
   - type: 1
     pivot: 0
@@ -103,12 +107,12 @@ MonoBehaviour:
     frames:
     - frame: 40
       active: 1
-      position: {x: 0, y: 0.84, z: 1.08}
-      size: {x: 1, y: 1, z: 0.5}
+      position: {x: 0, y: 0.61, z: 1.08}
+      size: {x: 1, y: 1.35, z: 0.5}
     - frame: 43
       active: 1
-      position: {x: 0, y: 0.84, z: 1.08}
-      size: {x: 1, y: 1, z: 0.5}
+      position: {x: 0, y: 0.52, z: 1.08}
+      size: {x: 1, y: 1.43, z: 0.5}
   - type: 0
     pivot: 1
     frames:
@@ -134,3 +138,326 @@ MonoBehaviour:
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
+--- !u!114 &114097288536488508
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 12
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114105868209784942
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 19
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 13.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114174317983997664
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 0
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114185995089873936
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 69
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114332450226737204
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 80
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114361324986796640
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 12
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 1, y: 1, z: 1}
+--- !u!114 &114365693603549036
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 19
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114397843005067902
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startFrame: 0
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114403859500844904
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 19
+  effectPath: 
+  attached: 0
+  bone: 
+  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 &114550616663341652
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventCamera_Zoom
+  m_EditorClassIdentifier: 
+  startFrame: 0
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114562344124432874
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 0
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114589907415780854
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 40
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114620785128644246
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 30
+  effectPath: 
+  attached: 1
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114750047321414068
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 49
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114793878721939902
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 44
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 8.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114867933248405142
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 78
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}
+--- !u!114 &114918830733674386
+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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startFrame: 0
+  effectPath: 
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 0, y: 0, z: 0}