From fb8dba84fe70d4bad6d22900716a67b02766448a Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 21 Jun 2022 00:26:32 +0800 Subject: - meta --- Erika/Assets/Art/Models/Characters/Default.meta | 8 ----- Erika/Assets/Art/Models/Characters/Erika2.meta | 8 ----- .../AbstractWiresEffect/Scripts.meta | 8 ----- .../Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta | 8 ----- .../Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta | 8 ----- Erika/Assets/ProBuilder Data.meta | 8 +++++ Erika/Assets/Resources/Effects.meta | 8 +++++ Erika/Assets/Resources/Materials.meta | 2 +- Erika/Assets/Resources/Materials/Unit.meta | 2 +- Erika/Assets/Resources/Materials/Unit/Effect.meta | 8 ----- Erika/Assets/Resources/Prefabs.meta | 8 +++++ Erika/Assets/Resources/Prefabs/ui.meta | 8 +++++ Erika/Assets/Resources/Shaders/Include.meta | 8 ----- Erika/Assets/Resources/Shaders/Unit/Effect.meta | 8 ----- Erika/Assets/Resources/Unit.meta | 2 +- .../Unit/Monster/Robots_Prowler/ActionData.meta | 8 ----- .../Unit/Monster/Robots_Prowler/UnitData.meta | 8 ----- Erika/Assets/Resources/Unit/NPC.meta | 8 ----- Erika/Assets/Resources/Unit/PC.meta | 2 +- .../Resources/Unit/PC/Erika/Materials/Normal.meta | 8 ----- Erika/Assets/Resources/Unit/PC/Erika/Models.meta | 8 ----- Erika/Assets/Resources/Unit/PC/Erika/UnitData.meta | 8 ----- Erika/Assets/Resources/Unit/PC/ErikaCyborg.meta | 2 +- .../Resources/Unit/PC/ErikaCyborg/ActionData.meta | 8 ----- .../Unit/PC/ErikaCyborg/AnimationClip.meta | 8 ----- .../Unit/PC/ErikaCyborg/AnimationData.meta | 8 ----- .../Resources/Unit/PC/ErikaCyborg/Materials.meta | 2 +- .../Unit/PC/ErikaCyborg/Materials/AfterImage.meta | 8 ----- .../Unit/PC/ErikaCyborg/Materials/Normal.meta | 8 ----- .../Resources/Unit/PC/ErikaCyborg/Models.meta | 8 ----- .../Resources/Unit/PC/ErikaCyborg/RootMotion.meta | 8 ----- .../Resources/Unit/PC/ErikaCyborg/UnitData.meta | 8 ----- .../Resources/Unit/PC/ErikaCyborg/Weapons.meta | 8 ----- Erika/Assets/Resources/Unit/Prop.meta | 8 ----- Erika/Assets/Scripts/Curve3D.meta | 8 ----- Erika/Assets/Scripts/Drone.meta | 8 ----- Erika/Assets/Scripts/Managers/Physics.meta | 8 ----- Erika/Assets/Scripts/Managers/ResourceManager.cs | 42 +++++++++++++++++----- Erika/Assets/Scripts/Managers/UnitManager.cs | 2 +- Erika/Assets/Scripts/Props.meta | 8 ----- Erika/Assets/Scripts/Robot.meta | 8 ----- Erika/Assets/Scripts/Unit/AI/Actions.meta | 8 ----- Erika/Assets/Scripts/Unit/AI/Conditionals.meta | 8 ----- .../Unit/Components/UnitAnimation/UnitAnimation.cs | 35 +++++++++++++----- Erika/Assets/Scripts/Utils/LogHelper.cs | 18 +++++++--- Erika/Assets/Scripts/Utils/LogTag.cs | 8 +++++ Erika/Assets/Scripts/Utils/LogTag.cs.meta | 11 ++++++ .../UMotion/UMotionExamples/Example Scene.meta | 8 +++++ 48 files changed, 141 insertions(+), 275 deletions(-) delete mode 100644 Erika/Assets/Art/Models/Characters/Default.meta delete mode 100644 Erika/Assets/Art/Models/Characters/Erika2.meta delete mode 100644 Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta delete mode 100644 Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta delete mode 100644 Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta create mode 100644 Erika/Assets/ProBuilder Data.meta create mode 100644 Erika/Assets/Resources/Effects.meta delete mode 100644 Erika/Assets/Resources/Materials/Unit/Effect.meta create mode 100644 Erika/Assets/Resources/Prefabs.meta create mode 100644 Erika/Assets/Resources/Prefabs/ui.meta delete mode 100644 Erika/Assets/Resources/Shaders/Include.meta delete mode 100644 Erika/Assets/Resources/Shaders/Unit/Effect.meta delete mode 100644 Erika/Assets/Resources/Unit/Monster/Robots_Prowler/ActionData.meta delete mode 100644 Erika/Assets/Resources/Unit/Monster/Robots_Prowler/UnitData.meta delete mode 100644 Erika/Assets/Resources/Unit/NPC.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/Erika/Materials/Normal.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/Erika/Models.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/Erika/UnitData.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/ActionData.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/AnimationClip.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/AnimationData.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials/AfterImage.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials/Normal.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/Models.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/RootMotion.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/UnitData.meta delete mode 100644 Erika/Assets/Resources/Unit/PC/ErikaCyborg/Weapons.meta delete mode 100644 Erika/Assets/Resources/Unit/Prop.meta delete mode 100644 Erika/Assets/Scripts/Curve3D.meta delete mode 100644 Erika/Assets/Scripts/Drone.meta delete mode 100644 Erika/Assets/Scripts/Managers/Physics.meta delete mode 100644 Erika/Assets/Scripts/Props.meta delete mode 100644 Erika/Assets/Scripts/Robot.meta delete mode 100644 Erika/Assets/Scripts/Unit/AI/Actions.meta delete mode 100644 Erika/Assets/Scripts/Unit/AI/Conditionals.meta create mode 100644 Erika/Assets/Scripts/Utils/LogTag.cs create mode 100644 Erika/Assets/Scripts/Utils/LogTag.cs.meta create mode 100644 Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta diff --git a/Erika/Assets/Art/Models/Characters/Default.meta b/Erika/Assets/Art/Models/Characters/Default.meta deleted file mode 100644 index 43499fc7..00000000 --- a/Erika/Assets/Art/Models/Characters/Default.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e8a40298dd4efd14c9f90a63734ca39b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Models/Characters/Erika2.meta b/Erika/Assets/Art/Models/Characters/Erika2.meta deleted file mode 100644 index fd7369d9..00000000 --- a/Erika/Assets/Art/Models/Characters/Erika2.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 077f81003f9fc564791cce182048c2b0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta deleted file mode 100644 index b76e98a5..00000000 --- a/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 20381b3eecfbfe34a9d9222868969d29 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta deleted file mode 100644 index 41200932..00000000 --- a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: abff7cb61c760094f8ab9437379e0f2c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta deleted file mode 100644 index fa9e76cd..00000000 --- a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e38cb65072bb4a64cbe162792de9bec2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/ProBuilder Data.meta b/Erika/Assets/ProBuilder Data.meta new file mode 100644 index 00000000..8424bd32 --- /dev/null +++ b/Erika/Assets/ProBuilder Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62b452114e207404bacccba32c7da124 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Resources/Effects.meta b/Erika/Assets/Resources/Effects.meta new file mode 100644 index 00000000..0dc955d6 --- /dev/null +++ b/Erika/Assets/Resources/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5006e4ef2b844b489fbd83fb454a154 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Resources/Materials.meta b/Erika/Assets/Resources/Materials.meta index cac56889..256c22f4 100644 --- a/Erika/Assets/Resources/Materials.meta +++ b/Erika/Assets/Resources/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6eb7d667a12dd0d409af272e5c7f267a +guid: cc129ee3da2221d46936fff0deef1146 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Resources/Materials/Unit.meta b/Erika/Assets/Resources/Materials/Unit.meta index b2db0fdd..703f49c8 100644 --- a/Erika/Assets/Resources/Materials/Unit.meta +++ b/Erika/Assets/Resources/Materials/Unit.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f48ccdc5d29d31849a72a586f64f480d +guid: 5ec7c01810c2e0e449bf1fac1f9aac40 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Resources/Materials/Unit/Effect.meta b/Erika/Assets/Resources/Materials/Unit/Effect.meta deleted file mode 100644 index fdf8c1db..00000000 --- a/Erika/Assets/Resources/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/Resources/Prefabs.meta b/Erika/Assets/Resources/Prefabs.meta new file mode 100644 index 00000000..b9636e1e --- /dev/null +++ b/Erika/Assets/Resources/Prefabs.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..396594ea --- /dev/null +++ b/Erika/Assets/Resources/Prefabs/ui.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30914a6917746dc4dbcdb09c1eaba4bd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Resources/Shaders/Include.meta b/Erika/Assets/Resources/Shaders/Include.meta deleted file mode 100644 index 2666365a..00000000 --- a/Erika/Assets/Resources/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/Resources/Shaders/Unit/Effect.meta b/Erika/Assets/Resources/Shaders/Unit/Effect.meta deleted file mode 100644 index 7df9a033..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit.meta b/Erika/Assets/Resources/Unit.meta index d98e113b..4a9985d4 100644 --- a/Erika/Assets/Resources/Unit.meta +++ b/Erika/Assets/Resources/Unit.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff06ae71503b6d042a68ca32375fb3ea +guid: 4eb81d15d0561f04a95c69a410136edb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Resources/Unit/Monster/Robots_Prowler/ActionData.meta b/Erika/Assets/Resources/Unit/Monster/Robots_Prowler/ActionData.meta deleted file mode 100644 index ca7266b0..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/Monster/Robots_Prowler/UnitData.meta b/Erika/Assets/Resources/Unit/Monster/Robots_Prowler/UnitData.meta deleted file mode 100644 index 142f5872..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/NPC.meta b/Erika/Assets/Resources/Unit/NPC.meta deleted file mode 100644 index eeea13e1..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC.meta b/Erika/Assets/Resources/Unit/PC.meta index 88c277fd..fb54b69e 100644 --- a/Erika/Assets/Resources/Unit/PC.meta +++ b/Erika/Assets/Resources/Unit/PC.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3285b7f07964894b98d32c20a9a3511 +guid: 0a4f2ced0fc2a1e458aba43c63e00f4f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Resources/Unit/PC/Erika/Materials/Normal.meta b/Erika/Assets/Resources/Unit/PC/Erika/Materials/Normal.meta deleted file mode 100644 index 8c41a6b2..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/Erika/Models.meta b/Erika/Assets/Resources/Unit/PC/Erika/Models.meta deleted file mode 100644 index 11148d17..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/Erika/UnitData.meta b/Erika/Assets/Resources/Unit/PC/Erika/UnitData.meta deleted file mode 100644 index 7d4b13eb..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg.meta index fe746375..f99e1940 100644 --- a/Erika/Assets/Resources/Unit/PC/ErikaCyborg.meta +++ b/Erika/Assets/Resources/Unit/PC/ErikaCyborg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0bc8c659fc72c6943b6aa14687be7045 +guid: 1e9380b22eb77b24ea589663b472dd46 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Resources/Unit/PC/ErikaCyborg/ActionData.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/ActionData.meta deleted file mode 100644 index f5434a00..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/AnimationClip.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/AnimationClip.meta deleted file mode 100644 index 4ed2c938..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/AnimationData.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/AnimationData.meta deleted file mode 100644 index 43a52cd1..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/Materials.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials.meta index 31d1b1f6..41206d6a 100644 --- a/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials.meta +++ b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37865def2611e0d4ca14cbb519bb0b82 +guid: 532fc441c09fdd84ba500cdd820842b8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials/AfterImage.meta deleted file mode 100644 index 85d58a8c..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Materials/Normal.meta deleted file mode 100644 index dd867045..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/Models.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Models.meta deleted file mode 100644 index dc530723..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/RootMotion.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/RootMotion.meta deleted file mode 100644 index b28b6f04..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/UnitData.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/UnitData.meta deleted file mode 100644 index eeca0d3b..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/PC/ErikaCyborg/Weapons.meta b/Erika/Assets/Resources/Unit/PC/ErikaCyborg/Weapons.meta deleted file mode 100644 index 7f91da28..00000000 --- a/Erika/Assets/Resources/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/Resources/Unit/Prop.meta b/Erika/Assets/Resources/Unit/Prop.meta deleted file mode 100644 index affd6eed..00000000 --- a/Erika/Assets/Resources/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/Scripts/Curve3D.meta b/Erika/Assets/Scripts/Curve3D.meta deleted file mode 100644 index fef1c5e7..00000000 --- a/Erika/Assets/Scripts/Curve3D.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad8b718b6b700d8419838dad07158567 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Drone.meta b/Erika/Assets/Scripts/Drone.meta deleted file mode 100644 index 694cff70..00000000 --- a/Erika/Assets/Scripts/Drone.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec3412151f8a72a41b2ed21316763399 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Managers/Physics.meta b/Erika/Assets/Scripts/Managers/Physics.meta deleted file mode 100644 index 2296b3f8..00000000 --- a/Erika/Assets/Scripts/Managers/Physics.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 603d4624aaedd794cb89497954a83f4a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Managers/ResourceManager.cs b/Erika/Assets/Scripts/Managers/ResourceManager.cs index f7904d1e..6cfcbf54 100644 --- a/Erika/Assets/Scripts/Managers/ResourceManager.cs +++ b/Erika/Assets/Scripts/Managers/ResourceManager.cs @@ -5,24 +5,50 @@ using UnityEngine; using UnityEditor; #endif -public partial class ResourceManager : Singleton +/// +/// 资源管理，为了Demo方便，运行时资源全部放在Resources下面 +/// +public class ResourceManager : Singleton { Dictionary m_CachedObject = new Dictionary(); - public T LoadAsset(string path) where T : UnityEngine.Object + /// + /// 读取Resources目录下的资源，对Assets/Resources/路径进行截取，并删除后缀 + /// 以下等价： + /// Assets/Resources/XXX/XXX + /// Assets/Resources/XXX/XXX.extension + /// XXX/XXX + /// XXX/XXX.extension + /// 最终都会解释为： + /// XXX/XXX + /// + /// + /// + /// + public T LoadAsset(string path) where T : UnityEngine.Object { if(m_CachedObject.ContainsKey(path)) { return m_CachedObject[path] as T; } -#if UNITY_EDITOR - T obj = AssetDatabase.LoadAssetAtPath(path); - m_CachedObject.Add(path, obj); -#else + string resPath = path.Replace("Assets/Resources/", ""); + int dot = resPath.LastIndexOf('.'); + if(dot != -1) + { + resPath = resPath.Substring(0, dot); + } -#endif - return obj; + LogHelper.Log(LogTag.Resources, "LoadAsset(), resPath=" + resPath + ", fullPath=" + path); + + T obj = Resources.Load(resPath); + m_CachedObject.Add(path, obj); + + return obj; } + public void UnloadAsset() + { + } + } diff --git a/Erika/Assets/Scripts/Managers/UnitManager.cs b/Erika/Assets/Scripts/Managers/UnitManager.cs index 920cbe9e..f0097692 100644 --- a/Erika/Assets/Scripts/Managers/UnitManager.cs +++ b/Erika/Assets/Scripts/Managers/UnitManager.cs @@ -41,7 +41,7 @@ public class UnitManager : Singleton snap.active = false; } return snap; - } + } public void ReleaseSnapshot(ref UnitSnapshot snap) { diff --git a/Erika/Assets/Scripts/Props.meta b/Erika/Assets/Scripts/Props.meta deleted file mode 100644 index bb96602e..00000000 --- a/Erika/Assets/Scripts/Props.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f299520ed9fcf4a45858ad4ef5a8d5d1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Robot.meta b/Erika/Assets/Scripts/Robot.meta deleted file mode 100644 index 0b5a087e..00000000 --- a/Erika/Assets/Scripts/Robot.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c09ca1609552d24bbe697d1516f8aa9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Actions.meta b/Erika/Assets/Scripts/Unit/AI/Actions.meta deleted file mode 100644 index 9b4ad463..00000000 --- a/Erika/Assets/Scripts/Unit/AI/Actions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 971e9d55b8bc0894eb6a110fb962000b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta deleted file mode 100644 index 70a86da5..00000000 --- a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 85b7e0c7ed1d12f42a5178bfbf3d934c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs index da16b947..a5de6c57 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs @@ -1,13 +1,17 @@ #define ANIM_CROSS_FADE + using System; using System.Collections; using System.Collections.Generic; using UnityEngine; + #if UNITY_EDITOR -using UnityEditor; +using UnityEditor; #endif - -// 单独一层动画 + +//http://unitylore.org/wiki/doku.php?id=l3y0gj + +// 单独一层动画 public class AnimatorLayerInfo { public int layer; @@ -186,12 +190,12 @@ public class AnimatorLayerInfo this.m_UnitAnimation = unitAnimation; this.m_Animator = animator; this.layer = layer; - m_CalcPlaybackTimeCoroutine = unitAnimation.StartCoroutine(CalcPlaybackRealTimeCoroutine()); + m_CalcPlaybackTimeCoroutine = unitAnimation.StartCoroutine(CoCalcPlaybackRealTimeCoroutine()); m_TimelineEventProxy = new TimelineEventProxy(unitAnimation.owner); applySpeedCurve = true; } - IEnumerator CalcPlaybackRealTimeCoroutine() + IEnumerator CoCalcPlaybackRealTimeCoroutine() { while (true) { @@ -224,6 +228,13 @@ public class AnimatorLayerInfo } } + /// + /// cross fade，不同状态间切换的间隔预先设置或者动态根据Pose的差异计算 + /// + /// + /// + /// + /// public void OnCrossFade(string animState, float normalizedTransitionDuration, float normalizedTimeOffset, float normalizedTransitionTime ) { m_CurrentState = animState; @@ -233,6 +244,11 @@ public class AnimatorLayerInfo playbackSpeed = 1; } + /// + /// 直接播放动作 + /// + /// + /// public void OnPlay(string animState, float normalizedTime) { m_CurrentState = animState; @@ -256,9 +272,12 @@ public class UnitAnimation : UnitComponent public virtual AnimatorLayerInfo baseLayer { get { return layers[0]; } - } - - public AnimatorLayerInfo layer + } + + /// + /// 角色动作只有一层，不使用layer mask和layer syncing + /// + public AnimatorLayerInfo layer { get { diff --git a/Erika/Assets/Scripts/Utils/LogHelper.cs b/Erika/Assets/Scripts/Utils/LogHelper.cs index 6dc89921..35d4db80 100644 --- a/Erika/Assets/Scripts/Utils/LogHelper.cs +++ b/Erika/Assets/Scripts/Utils/LogHelper.cs @@ -9,14 +9,24 @@ public static class LogHelper Debug.LogError(msg); } - public static void LogError(string tag, string msg) + //public static void LogError(string tag, string msg) + //{ + // Debug.LogError("[" + tag + "]" + msg); + //} + + public static void LogError(LogTag tag, string msg) { - Debug.LogError("[" + tag + "]" + msg); + Debug.LogError("[" + tag.ToString() + "]" + msg); } - public static void Log(string tag, string msg) + //public static void Log(string tag, string msg) + //{ + // Debug.Log("[" + tag + "]" + msg); + //} + + public static void Log(LogTag tag, string msg) { - Debug.Log("[" + tag + "]" + msg); + Debug.Log("[" + tag.ToString() + "]" + msg); } public static void Log(string msg) diff --git a/Erika/Assets/Scripts/Utils/LogTag.cs b/Erika/Assets/Scripts/Utils/LogTag.cs new file mode 100644 index 00000000..e1256a90 --- /dev/null +++ b/Erika/Assets/Scripts/Utils/LogTag.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public enum LogTag +{ + Resources, // 资源加载 +} diff --git a/Erika/Assets/Scripts/Utils/LogTag.cs.meta b/Erika/Assets/Scripts/Utils/LogTag.cs.meta new file mode 100644 index 00000000..674e8655 --- /dev/null +++ b/Erika/Assets/Scripts/Utils/LogTag.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b2b2239c6c06a274cbc5156394f46e62 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta b/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta new file mode 100644 index 00000000..7c152025 --- /dev/null +++ b/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13ba4d2ee6e74bf4b9aea7f330df39c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0