diff options
Diffstat (limited to 'Assets/Bundle/Unit/PC')
-rw-r--r-- | Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset | 13 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta (renamed from Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta) | 2 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab | 9 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/Erika/UnitData.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta (renamed from Assets/Bundle/Unit/PC/Erika/Models.meta) | 2 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta | 8 | ||||
-rw-r--r-- | Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta | 8 |
14 files changed, 14 insertions, 92 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset index 4b218c2a..0e7e544f 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Run animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Run.anim + note: animationEvents: [] hurtBoxes: - collider: @@ -74,21 +75,21 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 1.2 + value: 1.1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 1.2 + value: 1.1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 - inWeight: 0 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta index 8c41a6b2..855459bb 100644 --- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta +++ b/Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5dc1b71affc68b54594096a1b96a5c00 +guid: 3ab09dc0a18f20b4ea29507887e11428 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab index e6332658..75d3780d 100644 --- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab +++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab @@ -649,8 +649,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: showGizmos: 1 + root: {fileID: 6930221487356679114} afterImageAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab - bones: + m_Bones: m_keys: 0000000001000000020000000300000004000000050000000600000007000000080000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f0000002000000021000000220000002300000024000000250000002600000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003c0000003d0000003e0000003f00000050000000510000005200000053000000 m_values: - {fileID: 6931910881339740176} @@ -708,16 +709,16 @@ MonoBehaviour: - {fileID: 6930399342477815872} - {fileID: 6931776861846272074} - {fileID: 6929941362883253820} - referencePoints: + m_ReferencePoints: m_keys: 0100000014000000 m_values: - {fileID: 0} - {fileID: 0} snapshotBound: 5 - mainRenderer: + m_MainRenderer: tag: 0 renderer: {fileID: 7046772783541976850} - renderers: + m_Renderers: - tag: 0 renderer: {fileID: 7046772783541976850} --- !u!1 &6928056367075676882 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/Models.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta index 11148d17..be6badd6 100644 --- a/Assets/Bundle/Unit/PC/Erika/Models.meta +++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d712421d808a43438a43d8a5d34effe +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: |