diff options
Diffstat (limited to 'Assets/Bundle/Unit/PC')
15 files changed, 44 insertions, 104 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset index b17bb4ff..db86e69f 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Frank_RPG_Assassin_Combo02_1(Clone) + m_Name: Frank_RPG_Assassin_Combo02_1 m_EditorClassIdentifier: animationName: Frank_RPG_Assassin_Combo02_1 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim @@ -152,16 +152,20 @@ MonoBehaviour: m_Name: EventProjectile m_EditorClassIdentifier: startFrame: 7 + name: + tag: projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab attachedToBone: 0 bone: posOffset: {x: 0, y: 1, z: 0} rotation: {x: 0, y: 0, z: 0} scale: {x: 1, y: 1, z: 1} + lifeTime: 0 + moveType: 0 velocity: {x: 1, y: 0, z: 0} towardDirection: 0 - hitResponse: 0 sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab + hitResponse: 0 --- !u!114 &114273515162279198 MonoBehaviour: m_ObjectHideFlags: 0 @@ -175,16 +179,20 @@ MonoBehaviour: m_Name: EventProjectile m_EditorClassIdentifier: startFrame: 11 + name: + tag: projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab attachedToBone: 0 bone: posOffset: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: 0} scale: {x: 1, y: 1, z: 1} + lifeTime: 0 + moveType: 0 velocity: {x: 1, y: 0, z: 0} towardDirection: 0 - hitResponse: 0 sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab + hitResponse: 0 --- !u!114 &114533364586825402 MonoBehaviour: m_ObjectHideFlags: 0 @@ -217,16 +225,20 @@ MonoBehaviour: m_Name: EventProjectile m_EditorClassIdentifier: startFrame: 7 + name: + tag: projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab attachedToBone: 0 bone: posOffset: {x: 0, y: 1, z: 0} rotation: {x: 0, y: 0, z: 0} scale: {x: 1, y: 1, z: 1} + lifeTime: 0 + moveType: 0 velocity: {x: 1, y: 0, z: 0} towardDirection: 0 - hitResponse: 0 sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab + hitResponse: 0 --- !u!114 &114964882930719632 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index 915c2d85..550ad6ee 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 + m_Name: Take 001(Clone) m_EditorClassIdentifier: animationName: Take 001 animationPath: Assets/Art/Animations/Erika/Take 001.anim @@ -26,12 +26,14 @@ MonoBehaviour: type: 1 pivot: 0 multiHit: 0 + hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -112,12 +114,14 @@ MonoBehaviour: type: 0 pivot: 0 multiHit: 0 + hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -149,12 +153,14 @@ MonoBehaviour: type: 0 pivot: 0 multiHit: 0 + hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -186,12 +192,14 @@ MonoBehaviour: type: 0 pivot: 0 multiHit: 0 + hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -223,12 +231,14 @@ MonoBehaviour: type: 0 pivot: 0 multiHit: 0 + hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -260,12 +270,14 @@ MonoBehaviour: type: 0 pivot: 0 multiHit: 0 + hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -296,6 +308,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -564,13 +579,22 @@ MonoBehaviour: m_Name: EventProjectile m_EditorClassIdentifier: startFrame: 28 + name: + tag: Code,Robot projectilePath: - attached: 0 + attachedToBone: 0 bone: - position: {x: 0, y: 0, z: 0} + posOffset: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: 0} scale: {x: 0, y: 0, z: 0} + lifeTime: 0 + moveType: 0 velocity: {x: 0, y: 0, z: 0} + acceleration: {x: 0, y: -10, z: 0} + curvePath: + towardDirection: 0 + sparkPath: + hitResponse: 0 --- !u!114 &114550616663341652 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta deleted file mode 100644 index 8c41a6b2..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5dc1b71affc68b54594096a1b96a5c00 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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/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/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta index 1d22d5d2..be6badd6 100644 --- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta +++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e777b7b5be18d4e4092e116011158c68 +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: |