From 0a4dd643234284db73735f78ece9c209b80a72d6 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 3 Sep 2021 09:45:03 +0800 Subject: *misc --- Assets/ActionTool/Editor/ActionEditorStyles.cs | 4 +- Assets/ActionTool/Editor/ActionRootMotionEditor.cs | 2 +- .../Models/Characters/Erika2/Erika2.Avatar.meta | 8 ++++ .../Erika2/Erika2.AvatarDescription.meta | 8 ++++ .../Characters/Erika2/Erika2.BlendShapes.meta | 8 ++++ .../Models/Characters/Erika2/Erika2.Materials.meta | 8 ++++ .../Models/Characters/Erika2/Erika2.Meshes.meta | 8 ++++ .../Characters/Erika2/Erika2.MetaObject.meta | 8 ++++ .../Models/Characters/Erika2/Erika2.Textures.meta | 8 ++++ .../AbstractWiresEffect/Scripts.meta | 8 ---- Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta | 8 ---- Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta | 8 ---- Assets/Bundle/Material.meta | 8 ---- Assets/Bundle/Shader.meta | 8 ---- Assets/Bundle/UI.meta | 8 ---- .../Unit/Monster/Robots_Prowler/ActionData.meta | 8 ---- .../Unit/Monster/Robots_Prowler/UnitData.meta | 8 ---- Assets/Bundle/Unit/NPC.meta | 8 ---- .../PC/Erika/AnimationData/Air_Combo03_Z0_2.asset | 10 ++-- .../Erika_AnimatorControllerCrossFade.controller | 2 +- .../Bundle/Unit/PC/Erika/Materials/AfterImage.meta | 8 ---- Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta | 8 ---- Assets/Bundle/Unit/PC/Erika/Models.meta | 8 ---- Assets/Bundle/Unit/PC/Erika/UnitData.meta | 8 ---- Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta | 8 ++++ Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta | 8 ---- .../Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta | 8 ---- .../Bundle/Unit/PC/ErikaCyborg/AnimationData.meta | 8 ---- .../Unit/PC/ErikaCyborg/Materials/AfterImage.meta | 8 ---- .../Unit/PC/ErikaCyborg/Materials/Normal.meta | 8 ---- Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta | 8 ---- Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta | 8 ---- Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta | 8 ---- Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta | 8 ---- Assets/Bundle/Unit/Prop.meta | 8 ---- Assets/Data/ActionData.meta | 8 ---- Assets/Data/AnimationData/Erika.meta | 8 ---- Assets/Data/RootMotionData/Erika.meta | 8 ---- Assets/Data/UnitData.meta | 8 ---- Assets/Scripts/Curve3D.meta | 8 ---- Assets/Scripts/Drone.meta | 8 ---- Assets/Scripts/Props.meta | 8 ---- Assets/Scripts/Robot.meta | 8 ---- Assets/Scripts/Scene.meta | 8 ---- .../Unit/Components/UnitAnimation/PCAnimation.cs | 3 +- .../Unit/Components/UnitAnimation/UnitAnimation.cs | 32 ++++++++++--- Assets/Scripts/Unit/Components/UnitCollider.cs | 2 +- Assets/Scripts/Unit/UnitRootMotion.cs | 56 ++++++++++++++++------ .../Atmospheric Height Fog/Core/Editor.meta | 8 ++++ .../Atmospheric Height Fog/Core/Functions.meta | 8 ++++ .../Atmospheric Height Fog/Core/Includes.meta | 8 ++++ .../Atmospheric Height Fog/Core/Pipelines.meta | 8 ++++ .../Atmospheric Height Fog/Core/Resources.meta | 8 ++++ .../Atmospheric Height Fog/Core/Runtime.meta | 8 ++++ .../Atmospheric Height Fog/Core/Shaders.meta | 8 ++++ .../Atmospheric Height Fog/Demo/Animation.meta | 8 ++++ .../Atmospheric Height Fog/Demo/Materials.meta | 8 ++++ .../Atmospheric Height Fog/Demo/Shaders.meta | 8 ++++ Assets/ThirdParty/BOXOPHOBIC/User.meta | 8 ++++ .../BOXOPHOBIC/Utils/Editor/Constants.meta | 8 ++++ .../BOXOPHOBIC/Utils/Editor/SettingsUtils.meta | 8 ++++ .../BOXOPHOBIC/Utils/Editor/StyledGUI.meta | 8 ++++ .../BOXOPHOBIC/Utils/Editor/StyledInspector.meta | 8 ++++ .../BOXOPHOBIC/Utils/Editor/StyledMaterial.meta | 8 ++++ .../BOXOPHOBIC/Utils/Editor/StyledMono.meta | 8 ++++ Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta | 8 ++++ .../BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta | 8 ++++ .../BOXOPHOBIC/Utils/Scripts/StyledInspector.meta | 8 ++++ .../BOXOPHOBIC/Utils/Scripts/StyledMono.meta | 8 ++++ 69 files changed, 314 insertions(+), 285 deletions(-) create mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta create mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta create mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta create mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta create mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta create mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta create mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta delete mode 100644 Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta delete mode 100644 Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta delete mode 100644 Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta delete mode 100644 Assets/Bundle/Material.meta delete mode 100644 Assets/Bundle/Shader.meta delete mode 100644 Assets/Bundle/UI.meta delete mode 100644 Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta delete mode 100644 Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta delete mode 100644 Assets/Bundle/Unit/NPC.meta delete mode 100644 Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta delete mode 100644 Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta delete mode 100644 Assets/Bundle/Unit/PC/Erika/Models.meta delete mode 100644 Assets/Bundle/Unit/PC/Erika/UnitData.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta delete mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta delete mode 100644 Assets/Bundle/Unit/Prop.meta delete mode 100644 Assets/Data/ActionData.meta delete mode 100644 Assets/Data/AnimationData/Erika.meta delete mode 100644 Assets/Data/RootMotionData/Erika.meta delete mode 100644 Assets/Data/UnitData.meta delete mode 100644 Assets/Scripts/Curve3D.meta delete mode 100644 Assets/Scripts/Drone.meta delete mode 100644 Assets/Scripts/Props.meta delete mode 100644 Assets/Scripts/Robot.meta delete mode 100644 Assets/Scripts/Scene.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/User.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta create mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta (limited to 'Assets') diff --git a/Assets/ActionTool/Editor/ActionEditorStyles.cs b/Assets/ActionTool/Editor/ActionEditorStyles.cs index 896db183..b424a8c6 100644 --- a/Assets/ActionTool/Editor/ActionEditorStyles.cs +++ b/Assets/ActionTool/Editor/ActionEditorStyles.cs @@ -30,6 +30,7 @@ namespace ActionTool public Texture2D deleteIcon; public Texture2D infoIcon; public Texture2D keyIcon; + public Texture2D recordIcon; private static ActionEditorStyles s_instance; public static ActionEditorStyles Get() @@ -53,8 +54,9 @@ namespace ActionTool deleteIcon = EditorGUIUtility.FindTexture("d_P4_DeletedLocal"); infoIcon = EditorGUIUtility.FindTexture("console.infoicon"); keyIcon = EditorGUIUtility.FindTexture("d_animationkeyframe"); + recordIcon = EditorGUIUtility.FindTexture("d_Animation.Record"); - InitStyle(out textBoldBig, GUI.skin.label, s => { + InitStyle(out textBoldBig, GUI.skin.label, s => { s.fontStyle = FontStyle.Bold; s.fontSize = 18; s.alignment = TextAnchor.MiddleCenter; diff --git a/Assets/ActionTool/Editor/ActionRootMotionEditor.cs b/Assets/ActionTool/Editor/ActionRootMotionEditor.cs index 204a97b2..f6a97efe 100644 --- a/Assets/ActionTool/Editor/ActionRootMotionEditor.cs +++ b/Assets/ActionTool/Editor/ActionRootMotionEditor.cs @@ -74,7 +74,7 @@ namespace ActionTool { x += kToolbarControlMargin; Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize); - IsRecord = GUI.Toggle(rect, IsRecord, m_UITextureRecord, GUI.skin.button); + IsRecord = GUI.Toggle(rect, IsRecord, EditorGUIUtility.IconContent("d_Animation.Record"), GUI.skin.button); x += kToolbarControlSize; } diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta new file mode 100644 index 00000000..4627f5df --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d467e546efed7054c934b1a97a116c5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta new file mode 100644 index 00000000..ab214036 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 063d53dfefca4e3429f5788835b0b4ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta new file mode 100644 index 00000000..ee2ffc5f --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b82ae836c84f36049bdbdb08743b98e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta new file mode 100644 index 00000000..e0cb5de8 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c219c63d9953ba84b8cbe80444bdbf22 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta new file mode 100644 index 00000000..640ede12 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32ad36f78e7f23f46a0ce64fce991723 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta new file mode 100644 index 00000000..4d017390 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93031cff7ea5a314ca110920f817635f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta new file mode 100644 index 00000000..0d171fe4 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69c2852d26b47fa44a688db1349ae258 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta deleted file mode 100644 index b76e98a5..00000000 --- a/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/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta deleted file mode 100644 index 41200932..00000000 --- a/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/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta deleted file mode 100644 index fa9e76cd..00000000 --- a/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/Assets/Bundle/Material.meta b/Assets/Bundle/Material.meta deleted file mode 100644 index 85215e86..00000000 --- a/Assets/Bundle/Material.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8641bb4d4eee8b1419a1c8316ff9aee5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta deleted file mode 100644 index 92ded933..00000000 --- a/Assets/Bundle/Shader.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5a8ba4f43d9a7b24d855cadccb986b60 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta deleted file mode 100644 index 0914914c..00000000 --- a/Assets/Bundle/UI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4392471259b05a74a82a4bc72b510eb1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta deleted file mode 100644 index ca7266b0..00000000 --- a/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/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta deleted file mode 100644 index 142f5872..00000000 --- a/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/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta deleted file mode 100644 index eeea13e1..00000000 --- a/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/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset index 386b1405..1bc564a9 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 @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Combo03_Z0_2 + m_Name: Air_Combo03_Z0_2(Clone) m_EditorClassIdentifier: animationName: Air_Combo03_Z0_2 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_2.anim @@ -108,7 +108,7 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -131,8 +131,10 @@ MonoBehaviour: m_keys: m_values: [] toggles: - m_keys: - m_values: [] + m_keys: 00000000 + m_values: + - from: 0.54 + to: 1 parameters: m_keys: m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller index 17b56b71..a2a19b03 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller @@ -593,7 +593,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 49bee39a341b8a04f954ff83d44eea6e, type: 2} + m_Motion: {fileID: 7400000, guid: f132e9d177395cc44a2e06c71cbd7849, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta deleted file mode 100644 index 1d22d5d2..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e777b7b5be18d4e4092e116011158c68 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta new file mode 100644 index 00000000..be6badd6 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c46a5a23283c7d428ae8bb13663ab6a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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: diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta deleted file mode 100644 index affd6eed..00000000 --- a/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/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta deleted file mode 100644 index 48dd5af5..00000000 --- a/Assets/Data/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4e712aac7b9add047ab7a8691dd1a17a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/AnimationData/Erika.meta b/Assets/Data/AnimationData/Erika.meta deleted file mode 100644 index 10bf1fb1..00000000 --- a/Assets/Data/AnimationData/Erika.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 02289cc4b0fe1c34988c293ff6dbca02 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/RootMotionData/Erika.meta b/Assets/Data/RootMotionData/Erika.meta deleted file mode 100644 index 57b03e09..00000000 --- a/Assets/Data/RootMotionData/Erika.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c4e05f9eb0abc949a472e82070dfef1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta deleted file mode 100644 index d0809213..00000000 --- a/Assets/Data/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5bdb120d934aa114ab2f20e111a3c4d2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Curve3D.meta b/Assets/Scripts/Curve3D.meta deleted file mode 100644 index fef1c5e7..00000000 --- a/Assets/Scripts/Curve3D.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad8b718b6b700d8419838dad07158567 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Drone.meta b/Assets/Scripts/Drone.meta deleted file mode 100644 index 694cff70..00000000 --- a/Assets/Scripts/Drone.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec3412151f8a72a41b2ed21316763399 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta deleted file mode 100644 index bb96602e..00000000 --- a/Assets/Scripts/Props.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f299520ed9fcf4a45858ad4ef5a8d5d1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Robot.meta b/Assets/Scripts/Robot.meta deleted file mode 100644 index 0b5a087e..00000000 --- a/Assets/Scripts/Robot.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c09ca1609552d24bbe697d1516f8aa9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta deleted file mode 100644 index eb7a8716..00000000 --- a/Assets/Scripts/Scene.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaee2d0f48cff9b40baf0686a8105600 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs index dbd4dd49..8d737277 100644 --- a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs +++ b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs @@ -68,7 +68,7 @@ public class PCAnimation : UnitAnimation private UnitActionData m_ActionData; - public bool applyRootMotion { get; set; }// 动态设置root motion + public bool applyRootMotion { get; set; } public bool applyRootCurve { get; set; } // 程序生成的root motion public bool updateAnimationAuto { get; private set; } // 自动更新动画 @@ -129,6 +129,7 @@ public class PCAnimation : UnitAnimation { if (!applyRootMotion) return; + m_Owner.unitRootMotion.UpdateRootMotion(); } diff --git a/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs index a9c50ac3..db81a2ed 100644 --- a/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs +++ b/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs @@ -24,7 +24,7 @@ public class AnimatorLayerInfo { get { - AnimatorClipInfo[] clipInfos = clipInfo; + AnimatorClipInfo[] clipInfos = clipsInfo; if (clipInfos == null || clipInfos.Length == 0) return null; var clip = clipInfos[0]; //选第一个 @@ -57,7 +57,7 @@ public class AnimatorLayerInfo private int preStateHash = -1; // 当前正在播放和融合的片段信息 - public AnimatorClipInfo[] clipInfo + public AnimatorClipInfo[] clipsInfo { get { @@ -78,6 +78,14 @@ public class AnimatorLayerInfo } } + public AnimatorClipInfo clipInfo + { + get + { + return clipsInfo[0]; + } + } + public int stateHash { get @@ -91,7 +99,7 @@ public class AnimatorLayerInfo { get { - return playbackNormalizedTime * clipInfo[0].clip.length; + return playbackNormalizedTime * clipInfo.clip.length; } } @@ -116,7 +124,7 @@ public class AnimatorLayerInfo //if (state.IsName("Attack0")) //{ // Debug.Log("normalizedTime=" + state.normalizedTime); - // Debug.Log("playbackTimeInSeconds=" + state.normalizedTime * clipInfo[0].clip.length); + // Debug.Log("playbackTimeInSeconds=" + state.normalizedTime * clipInfo.clip.length); //} return state.normalizedTime % 1f; } @@ -258,7 +266,13 @@ public class UnitAnimation : UnitComponent if (layer == null) return; layer.OnPlay(animState, normalizedTime); - } + + UnitRootMotion rm = m_Owner.GetComponent(); + if(rm) + { + rm.OnAnimationChange(); + } + } public void CrossFade(string animState, float normalizedTransitionDuration, int layerIndex = 0, float normalizedTimeOffset = float.NegativeInfinity, float normalizedTransitionTime = 0.0f) { @@ -266,6 +280,12 @@ public class UnitAnimation : UnitComponent if (layer == null) return; layer.OnCrossFade(animState, normalizedTransitionDuration, normalizedTimeOffset, normalizedTransitionTime); - } + + UnitRootMotion rm = m_Owner.GetComponent(); + if (rm) + { + rm.OnAnimationChange(); + } + } } diff --git a/Assets/Scripts/Unit/Components/UnitCollider.cs b/Assets/Scripts/Unit/Components/UnitCollider.cs index 63e1ff7f..797eb480 100644 --- a/Assets/Scripts/Unit/Components/UnitCollider.cs +++ b/Assets/Scripts/Unit/Components/UnitCollider.cs @@ -35,7 +35,7 @@ public class UnitCollider : UnitComponent { var layerInfo = m_Owner.unitAnimation.layers[0]; AnimationData animData = layerInfo.animationData; - AnimatorClipInfo[] clipInfos = layerInfo.clipInfo; + AnimatorClipInfo[] clipInfos = layerInfo.clipsInfo; //if(clipInfos == null || clipInfos.Length == 0) //{ // return null; diff --git a/Assets/Scripts/Unit/UnitRootMotion.cs b/Assets/Scripts/Unit/UnitRootMotion.cs index c920010a..5a17da61 100644 --- a/Assets/Scripts/Unit/UnitRootMotion.cs +++ b/Assets/Scripts/Unit/UnitRootMotion.cs @@ -11,15 +11,21 @@ public class UnitRootMotion : UnitComponent { RootMotionData m_RootMotionData; - private float m_PrevNormalTime; + float m_PrevFrame; + AnimationData m_PrevAnimationData; public override void Initialize() { base.Initialize(); + + m_PrevFrame = 0; + m_PrevAnimationData = null; } #if false // 用自定义root motion + private float m_PrevNormalTime; + Dictionary m_RootMotionDic = new Dictionary(); public void Reset() @@ -63,25 +69,47 @@ public class UnitRootMotion : UnitComponent #else - public override void OnUpdate() + public override void OnUpdate() { base.OnUpdate(); } + public void OnAnimationChange() + { + m_PrevAnimationData = null; + } + public void UpdateRootMotion() { - // 因为Unti被旋转了90度，所以这里的deltaPosition的forward是x方向了 - Vector3 dest = m_Owner.unitAnimation.animator.deltaPosition; - dest.z = 0; - - var state = m_Owner.unitAnimation.layers[0].stateInfo; - if(state.IsTag("IgnoreY")) - { - dest.y = 0; - } - - //m_Owner.transform.position += RootMotionUtility.ExchangeXZ(dest); // 不需要exchangeXZ - m_Owner.transform.position += dest; + bool overrideRootMotion = m_Owner.unitAnimation.baseLayer.animationData.overrideRootMotion; + if(overrideRootMotion) + { + var baseLayer = m_Owner.unitAnimation.baseLayer; + var rmData = m_Owner.unitAnimation.baseLayer.animationData.rootMotionOverrideData; + float frame = baseLayer.playbackNormalizedTime * baseLayer.clipInfo.clip.length * TimelineEventProxy.FPS; + var animData = m_Owner.unitAnimation.baseLayer.animationData; + if(animData != m_PrevAnimationData) + { + m_PrevAnimationData = animData; + m_PrevFrame = frame; + } + Vector3 dest = rmData.GetRootMotionDistance(m_PrevFrame, frame); + m_Owner.transform.position += dest; + m_PrevFrame = frame; + } + else + { + // 因为Unti被旋转了90度，所以这里的deltaPosition的forward是x方向了 + Vector3 dest = m_Owner.unitAnimation.animator.deltaPosition; + dest.z = 0; + var state = m_Owner.unitAnimation.baseLayer.stateInfo; + if (state.IsTag("IgnoreY")) + { + dest.y = 0; + } + //m_Owner.transform.position += RootMotionUtility.ExchangeXZ(dest); // 不需要exchangeXZ + m_Owner.transform.position += dest; + } } #endif diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta new file mode 100644 index 00000000..fc69e121 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b4092aee1925294286c91c8b2f0246b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta new file mode 100644 index 00000000..16dceda0 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f677b222bd908a4eb6e8b6f446f0c95 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta new file mode 100644 index 00000000..3feeaa0c --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f65f99730f449cd42b5428ed33579276 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta new file mode 100644 index 00000000..d2cc8de3 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d1d19a8d9a9258489a54453cbd409bf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta new file mode 100644 index 00000000..60091bee --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5fa002e3b21354f4b847ab441877ecda +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta new file mode 100644 index 00000000..c50ca514 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9c840958f8546c4e9667f0757d8557a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta new file mode 100644 index 00000000..20eca756 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f14f2cbed5e00a40a3fa94241cf6c27 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta new file mode 100644 index 00000000..35b83bfb --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e705a58e98ec1a409129eb57fa15477 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta new file mode 100644 index 00000000..88f9f501 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c77d30703ebcc5c4bbb57517b133b0f4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta new file mode 100644 index 00000000..4d33dc86 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 142685877fe50f64caba63abfda167a7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/User.meta b/Assets/ThirdParty/BOXOPHOBIC/User.meta new file mode 100644 index 00000000..293c8b38 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/User.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0aa5379d96b0e14795df45a380643fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta new file mode 100644 index 00000000..a5ee5a64 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c9d2f06234e7e643b2118057d8e0673 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta new file mode 100644 index 00000000..3fdad1c4 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6fcf51a07e84ca941a62046a0b693a19 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta new file mode 100644 index 00000000..94757653 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28d59ef8b8ebe8d48a3a27e990a2d7e9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta new file mode 100644 index 00000000..d2c0b7b4 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edc7fbbe770e693488770a7aaeae2aa6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta new file mode 100644 index 00000000..069be515 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ed975ceb335a144c93320e22ae1780a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta new file mode 100644 index 00000000..7ea21e4b --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a3babbb69c72f8419243020c0dfb70b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta new file mode 100644 index 00000000..f2a1c8a6 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd6738b410016744eaf6e182174c0b2b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta new file mode 100644 index 00000000..50e68eff --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f32bd65977ebf9049bd5e40e18d1556c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta new file mode 100644 index 00000000..68664862 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 151a76ee3bec1ae449cd56f31d474de5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta new file mode 100644 index 00000000..aab2c856 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ae8613087e217249a69059295113b1c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0