diff options
Diffstat (limited to 'Assets/Bundle/Unit/PC')
21 files changed, 125 insertions, 121 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset b/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset index ad5d4207..0a2d8ca8 100644 --- a/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset +++ b/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset @@ -13,12 +13,37 @@ MonoBehaviour: m_Name: ErikaActionData m_EditorClassIdentifier: actions: - m_keys: 00000000020000000600000004000000050000000100000007000000 + m_keys: + - Idle + - Move + - Landing + - LandingGround + - Jump + - AirAttack0 + - AirAttack1 + - AirAttack2 + - AirAttack3 + - AirAttack4 + - AttackToAir + - AirDash + - Attack0 + - Attack1 + - Attack2 + - Attack3 m_values: - - {fileID: 7400000, guid: 6a53e3ed6230d2742939796aef1e214c, type: 2} + - {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} + - {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} + - {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} + - {fileID: 7400000, guid: 26bb0d2d4098c084b9f324a004bea6d2, type: 2} - {fileID: 7400000, guid: 80b0945bbe9b94f468cc20801c050baf, type: 2} - - {fileID: 7400000, guid: 21f8513f0b3b0b945b76bbf95e6adc3e, type: 2} - - {fileID: 7400000, guid: a7f4564d08baf0342bd790dda3aa1540, type: 2} - - {fileID: 7400000, guid: ac5153c0b622f6041984ea8c2155fa8a, type: 2} - - {fileID: 7400000, guid: b3b491ff9a4b4204fb54105483e9458f, type: 2} - - {fileID: 7400000, guid: f6b472b469a84bd4fb06b3b99d3c08b7, type: 2} + - {fileID: 7400000, guid: 3af4a4fdd9720044bacfd86b0c3435b1, type: 2} + - {fileID: 7400000, guid: f132e9d177395cc44a2e06c71cbd7849, type: 2} + - {fileID: 7400000, guid: 154fc7715a2686b43ba21cd2178be9a9, type: 2} + - {fileID: 7400000, guid: 1a50f1532c8bfe644869ccd4c1379a9e, type: 2} + - {fileID: 7400000, guid: 6543c9aee7b3f7b4d80c8f87fdf3c837, type: 2} + - {fileID: 7400000, guid: d2551386674378f4cbedd917bf6348c5, type: 2} + - {fileID: 7400000, guid: 76fde77dd4724694eb0955b10a0d54e4, type: 2} + - {fileID: 7400000, guid: 1c1b573ac9e8cb947afae3a21b84a6ce, type: 2} + - {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + - {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + - {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim b/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim index 0d5beaa3..c27f27ad 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim +++ b/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim @@ -31177,7 +31177,7 @@ AnimationClip: m_AdditiveReferencePoseTime: 0 m_StartTime: 0 m_StopTime: 2 - m_OrientationOffsetY: 0 + m_OrientationOffsetY: -19.7 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset index 9ac4cfb7..a49dbcb1 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset @@ -20,6 +20,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -53,3 +56,6 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset index 34f21520..c91f8013 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset @@ -22,6 +22,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -54,6 +60,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -138,3 +150,7 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.07 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset index 1009b6af..7fdac624 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset @@ -53,8 +53,12 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.45 + - from: 0.54 to: 1 parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.08 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset index 0f718029..9cf4efee 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset @@ -22,6 +22,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -62,6 +68,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -98,27 +110,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] - overrideRootMotion: 1 + overrideRootMotion: 0 rootMotionOverrideData: - positions: - - position: {x: 0, y: 0, z: 0} - frame: 0 - - position: {x: 0.79, y: 0.14, z: 0} - frame: 3 - - position: {x: 1.41, y: 0.24, z: 0} - frame: 6 - - position: {x: 2.44, y: 0.28, z: 0} - frame: 9 - - position: {x: 3.41, y: 0.25, z: 0} - frame: 12 - - position: {x: 3.83, y: 0.29, z: 0} - frame: 18 - - position: {x: 4.01, y: 0.26, z: 0} - frame: 28 - - position: {x: 4.09, y: 0.27, z: 0} - frame: 42 - - position: {x: 4.37, y: 0.14, z: 0} - frame: 45 + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -181,8 +175,12 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.69 + - from: 0.55 to: 1 parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.05 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset index 694b3f64..27a674b8 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset @@ -20,6 +20,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -55,3 +58,7 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.03 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index b372229a..a0695940 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/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 @@ -28,6 +28,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -116,6 +122,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -155,6 +167,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -194,6 +212,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -233,6 +257,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -272,6 +302,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta deleted file mode 100644 index 11148d17..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0d712421d808a43438a43d8a5d34effe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta index 1d22d5d2..b3286831 100644 --- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e777b7b5be18d4e4092e116011158c68 +guid: b5a895c20fc15c748a20b8f214dd24b5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta deleted file mode 100644 index 7d4b13eb..00000000 --- a/Assets/Bundle/Unit/PC/Erika/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 922befa8a94692845b88500a23229d7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta index 8c41a6b2..be6badd6 100644 --- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta +++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5dc1b71affc68b54594096a1b96a5c00 +guid: 2c46a5a23283c7d428ae8bb13663ab6a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta deleted file mode 100644 index f5434a00..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 07c3b2bf6cb8cc2498422bbb105cbad8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta deleted file mode 100644 index 4ed2c938..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 827d77abe87680a47ae2d71a9e953a18 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta deleted file mode 100644 index 43a52cd1..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a2b72fbb41383047ac45e6c22ea9663 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta deleted file mode 100644 index 85d58a8c..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b2b0838fb0603964e99904eefe81ad7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta deleted file mode 100644 index dd867045..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c8a678ea9e801f439a1003d04f33cf5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta deleted file mode 100644 index dc530723..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ebf636c7cf7b1934b885298ce1f5f42e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta deleted file mode 100644 index b28b6f04..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2022e8298d3a8624992143eb57c0f8ac -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta deleted file mode 100644 index eeca0d3b..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6aa859c834c51f498ef0b3c3b83a0f5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta deleted file mode 100644 index 7f91da28..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df69962f5b01e444a8bea87e31c7d0a4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: |