diff options
author | chai <chaifix@163.com> | 2022-06-21 23:00:52 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2022-06-21 23:00:52 +0800 |
commit | c40af559c1d946381d32a2c79c3ffcd2670bbbb5 (patch) | |
tree | 58205ca6a52c57af584064a8936eb3dc375847ac | |
parent | c7ee5ed7c9575eda05404f6022992f179b36d3a0 (diff) |
* placeholder clip
59 files changed, 5 insertions, 179 deletions
diff --git a/Documents/动画相关问题.xlsx b/Documents/动画相关问题.xlsx Binary files differindex 1e3519dc..7d89e043 100644 --- a/Documents/动画相关问题.xlsx +++ b/Documents/动画相关问题.xlsx diff --git a/Documents/模型.xlsx b/Documents/模型.xlsx Binary files differindex 0f6e7cb1..ecfb7c57 100644 --- a/Documents/模型.xlsx +++ b/Documents/模型.xlsx diff --git a/Erika/Assets/Bundle/Materials/Unit/Effect.meta b/Erika/Assets/Bundle/Materials/Unit/Effect.meta deleted file mode 100644 index fdf8c1db..00000000 --- a/Erika/Assets/Bundle/Materials/Unit/Effect.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0525fec1eb7cc94458170e9e106955d5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Shaders/Include.meta b/Erika/Assets/Bundle/Shaders/Include.meta deleted file mode 100644 index 2666365a..00000000 --- a/Erika/Assets/Bundle/Shaders/Include.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dc32af12c5122994d8791378227adeb6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Shaders/Unit/Effect.meta b/Erika/Assets/Bundle/Shaders/Unit/Effect.meta deleted file mode 100644 index 7df9a033..00000000 --- a/Erika/Assets/Bundle/Shaders/Unit/Effect.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9cc4684b9f432f149b16a51f148c9490 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta deleted file mode 100644 index ca7266b0..00000000 --- a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a1d7b6e0d8fb1a642a65011fb6cd7d89 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta deleted file mode 100644 index 142f5872..00000000 --- a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6ad7401709700f34db2b795830937d76 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/NPC.meta b/Erika/Assets/Bundle/Unit/NPC.meta deleted file mode 100644 index eeea13e1..00000000 --- a/Erika/Assets/Bundle/Unit/NPC.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8ced034d375cdfa488814663ea17a79b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta deleted file mode 100644 index 8c41a6b2..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta deleted file mode 100644 index 11148d17..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip.meta index b3286831..b3286831 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim index 7010af54..7010af54 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim.meta index 810dd5b4..810dd5b4 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim index 01bf4833..01bf4833 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim.meta index 4e5c881f..4e5c881f 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim index b66b2357..b66b2357 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim.meta index 08b7cfa7..08b7cfa7 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim index 356f916d..356f916d 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim.meta index 34213b16..34213b16 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim index 8f952fec..8f952fec 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim.meta index 17683e3b..17683e3b 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim index 2cbd6d95..2cbd6d95 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim.meta index e2cf3478..e2cf3478 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim index e434d878..e434d878 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim.meta index ea7f3d19..ea7f3d19 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim index 74debe7a..74debe7a 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim.meta index 59b914fc..59b914fc 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim index 2f1910a5..2f1910a5 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim.meta index 2b91ac59..2b91ac59 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim index 5aad0009..5aad0009 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim.meta index 3f551c37..3f551c37 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim index 47d3ad18..47d3ad18 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim.meta index 41a53c73..41a53c73 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim index c89c1003..c89c1003 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim.meta index 61915493..61915493 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim index 79cb6fb9..79cb6fb9 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim.meta index 72aa409b..72aa409b 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim index bb4169c4..bb4169c4 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim.meta index 3d6af889..3d6af889 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim index f47fb06d..f47fb06d 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim.meta index 264759a6..264759a6 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim index 9126daa9..9126daa9 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim.meta index 2593fd56..2593fd56 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim.meta +++ b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta deleted file mode 100644 index 7d4b13eb..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta deleted file mode 100644 index f5434a00..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta deleted file mode 100644 index 4ed2c938..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta deleted file mode 100644 index 43a52cd1..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta deleted file mode 100644 index 85d58a8c..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta deleted file mode 100644 index dd867045..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta deleted file mode 100644 index dc530723..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta deleted file mode 100644 index b28b6f04..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta deleted file mode 100644 index eeca0d3b..00000000 --- a/Erika/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/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta deleted file mode 100644 index 7f91da28..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df69962f5b01e444a8bea87e31c7d0a4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Prop.meta b/Erika/Assets/Bundle/Unit/Prop.meta deleted file mode 100644 index affd6eed..00000000 --- a/Erika/Assets/Bundle/Unit/Prop.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dafc173db1ebeab4c80641cc3d4fa528 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Resources/AssetBundleDefine.asset.meta b/Erika/Assets/Resources/AssetBundleDefine.asset.meta index 3df58d7a..16995220 100644 --- a/Erika/Assets/Resources/AssetBundleDefine.asset.meta +++ b/Erika/Assets/Resources/AssetBundleDefine.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: aa28d1b09098c054d9d526a0d1703142 +guid: e1ac6f70cea1814419749d27553f6fb0 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Erika/Assets/Resources/Effects.meta b/Erika/Assets/Resources/Effects.meta deleted file mode 100644 index 0dc955d6..00000000 --- a/Erika/Assets/Resources/Effects.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a5006e4ef2b844b489fbd83fb454a154 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Resources/Prefabs.meta b/Erika/Assets/Resources/Prefabs.meta deleted file mode 100644 index b9636e1e..00000000 --- a/Erika/Assets/Resources/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6be3bc1f6e8bbe43b6e5ec429b9c199 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Resources/Prefabs/ui.meta b/Erika/Assets/Resources/Prefabs/ui.meta deleted file mode 100644 index 396594ea..00000000 --- a/Erika/Assets/Resources/Prefabs/ui.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30914a6917746dc4dbcdb09c1eaba4bd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/UnitActionData.cs b/Erika/Assets/Scripts/Unit/UnitActionData.cs index 8a06a249..bfafd4df 100644 --- a/Erika/Assets/Scripts/Unit/UnitActionData.cs +++ b/Erika/Assets/Scripts/Unit/UnitActionData.cs @@ -6,7 +6,9 @@ using UnityEngine; [Serializable] public class TriggerAnimationDictionary : SerializableDictionary<string/*override clip name\state name*/, AnimationClip> { } -// 配置角色的动画 +/// <summary> +/// 角色动作配置,状态名-动作 +/// </summary> [CreateAssetMenu(fileName = "Unit Action Data")] public class UnitActionData : ScriptableObject { |