*misc

6 files changed, 93 insertions, 6 deletions

diff --git a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
new file mode 100644
index 00000000..f9a509f4
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
@@ -0,0 +1,22 @@
+%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: Air_Attk_1
+  m_EditorClassIdentifier: 
+  animationName: Air_Attk_1
+  animationPath: Assets/Art/Animations/Erika/Air_Attk_1.anim
+  animationEvents: []
+  hurtBoxes: []
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
diff --git a/Assets/Data/UnitData.meta b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset.meta
index d0809213..ed955b81 100644
--- a/Assets/Data/UnitData.meta
+++ b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 5bdb120d934aa114ab2f20e111a3c4d2
-folderAsset: yes
-DefaultImporter:
+guid: 14de9b009d1b4e748bed1da6a5771d72
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Data/AnimationData/Erika/Air_Dash.asset b/Assets/Data/AnimationData/Erika/Air_Dash.asset
new file mode 100644
index 00000000..c0b73c2f
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Air_Dash.asset
@@ -0,0 +1,48 @@
+%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: Air_Dash
+  m_EditorClassIdentifier: 
+  animationName: Air_Dash
+  animationPath: Assets/Art/Animations/Erika/Air_Dash.anim
+  animationEvents: []
+  hurtBoxes:
+  - type: 1
+    pivot: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.32, z: 0.5}
+    - frame: 4
+      active: 0
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 0.61, z: 0.5}
+    - frame: 22
+      active: 0
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 0.67, z: 0.5}
+    - frame: 37
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 0.59, z: 0.5}
+    - frame: 54
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.34, z: 0.5}
+  hitBoxes:
+  - type: 0
+    pivot: 1
+    frames: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Air_Dash.asset.meta b/Assets/Data/AnimationData/Erika/Air_Dash.asset.meta
new file mode 100644
index 00000000..77e02352
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Air_Dash.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8aa329a6d983d9d40af0c8090f0f122d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/AnimationData/Erika/SuperKickCombo.asset b/Assets/Data/AnimationData/Erika/SuperKickCombo.asset
index 9931a73a..b4fea728 100644
--- a/Assets/Data/AnimationData/Erika/SuperKickCombo.asset
+++ b/Assets/Data/AnimationData/Erika/SuperKickCombo.asset
@@ -15,8 +15,17 @@ MonoBehaviour:
   animationName: SuperKickCombo
   animationPath: Assets/Art/Animations/Erika/SuperKickCombo.anim
   animationEvents: []
-  hurtBoxes: []
-  hitBoxes: []
+  hurtBoxes:
+  - type: 1
+    pivot: 0
+    frames: []
+  hitBoxes:
+  - type: 0
+    pivot: 1
+    frames: []
+  - type: 0
+    pivot: 1
+    frames: []
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Take 001.asset b/Assets/Data/AnimationData/Erika/Take 001.asset
index 16700c41..70429638 100644
--- a/Assets/Data/AnimationData/Erika/Take 001.asset
+++ b/Assets/Data/AnimationData/Erika/Take 001.asset
@@ -54,7 +54,7 @@ MonoBehaviour:
     - frame: 45
       active: 1
       position: {x: 0, y: 0, z: 0}
-      size: {x: 1, y: 0.7, z: 0.5}
+      size: {x: 1, y: 0.61, z: 0.5}
     - frame: 82
       active: 1
       position: {x: 0, y: 0, z: 0}