diff options
Diffstat (limited to 'Assets/Data')
-rw-r--r-- | Assets/Data/AnimationData/Erika/Air_Attk_1.asset | 21 | ||||
-rw-r--r-- | Assets/Data/AnimationData/Erika/Air_Dash.asset | 14 | ||||
-rw-r--r-- | Assets/Data/AnimationData/Erika/Idle_Assassin.asset | 33 | ||||
-rw-r--r-- | Assets/Data/AnimationData/Erika/Idle_Assassin.asset.meta | 8 | ||||
-rw-r--r-- | Assets/Data/AnimationData/Erika/Take 001.asset | 2 | ||||
-rw-r--r-- | Assets/Data/UnitData.meta | 8 |
6 files changed, 79 insertions, 7 deletions
diff --git a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset index f9a509f4..f4fd6c35 100644 --- a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset +++ b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset @@ -15,7 +15,26 @@ MonoBehaviour: animationName: Air_Attk_1 animationPath: Assets/Art/Animations/Erika/Air_Attk_1.anim animationEvents: [] - hurtBoxes: [] + hurtBoxes: + - type: 1 + pivot: 0 + frames: + - frame: 0 + active: 1 + position: {x: 0, y: 0, z: 0} + size: {x: 1, y: 1.44, z: 0.5} + - frame: 6 + active: 1 + position: {x: 0, y: 0.25, z: 0} + size: {x: 1, y: 1.18, z: 0.5} + - frame: 46 + active: 1 + position: {x: 0, y: 0.28, z: 0} + size: {x: 1, y: 1.14, z: 0.5} + - frame: 51 + active: 1 + position: {x: 0, y: 0, z: 0} + size: {x: 1, y: 1.43, z: 0.5} hitBoxes: [] throwBoxes: [] blockBoxes: [] diff --git a/Assets/Data/AnimationData/Erika/Air_Dash.asset b/Assets/Data/AnimationData/Erika/Air_Dash.asset index c0b73c2f..07ea538e 100644 --- a/Assets/Data/AnimationData/Erika/Air_Dash.asset +++ b/Assets/Data/AnimationData/Erika/Air_Dash.asset @@ -27,14 +27,18 @@ MonoBehaviour: 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 + - frame: 14 active: 1 position: {x: 0, y: 0, z: 0} size: {x: 1, y: 0.59, z: 0.5} + - frame: 16 + active: 1 + position: {x: 0, y: 0, z: 0} + size: {x: 1, y: 0.56, z: 0.5} + - frame: 39 + active: 1 + position: {x: 0, y: 0, z: 0} + size: {x: 1, y: 0.58, z: 0.5} - frame: 54 active: 1 position: {x: 0, y: 0, z: 0} diff --git a/Assets/Data/AnimationData/Erika/Idle_Assassin.asset b/Assets/Data/AnimationData/Erika/Idle_Assassin.asset new file mode 100644 index 00000000..15961a5c --- /dev/null +++ b/Assets/Data/AnimationData/Erika/Idle_Assassin.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: Idle_Assassin + m_EditorClassIdentifier: + animationName: Idle_Assassin + animationPath: Assets/Art/Animations/Erika/Idle_Assassin.anim + animationEvents: [] + hurtBoxes: + - type: 1 + pivot: 0 + frames: + - frame: 0 + active: 1 + position: {x: 0, y: 0, z: 0} + size: {x: 1, y: 1.21, z: 0.5} + - frame: 119 + active: 1 + position: {x: 0, y: 0, z: 0} + size: {x: 1, y: 1.21, z: 0.5} + hitBoxes: [] + throwBoxes: [] + blockBoxes: [] + defendBoxes: [] diff --git a/Assets/Data/AnimationData/Erika/Idle_Assassin.asset.meta b/Assets/Data/AnimationData/Erika/Idle_Assassin.asset.meta new file mode 100644 index 00000000..0bc8e077 --- /dev/null +++ b/Assets/Data/AnimationData/Erika/Idle_Assassin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a3c79e83a98fb2418e2dbddeee9c0f2 +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 61f6845a..d5ec6661 100644 --- a/Assets/Data/AnimationData/Erika/Take 001.asset +++ b/Assets/Data/AnimationData/Erika/Take 001.asset @@ -107,7 +107,7 @@ MonoBehaviour: size: {x: 1, y: 1, z: 0.5} - frame: 43 active: 1 - position: {x: 0, y: 0.6, z: 1.08} + position: {x: 0, y: 0.84, z: 1.08} size: {x: 1, y: 1, z: 0.5} - type: 0 pivot: 1 diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta new file mode 100644 index 00000000..d0809213 --- /dev/null +++ b/Assets/Data/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bdb120d934aa114ab2f20e111a3c4d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: |