From 400fb6a0d06310e2260b370191666b5946cc763d Mon Sep 17 00:00:00 2001 From: jellejurre Date: Tue, 30 Jul 2024 17:16:48 +0200 Subject: [PATCH 1/6] Update Readme for Constraint beta --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f27813c..d3fafab 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ [![Generic badge](https://img.shields.io/github/downloads/VRLabs/Follower/total?label=Downloads)](https://github.com/VRLabs/Follower/releases/latest) [![Generic badge](https://img.shields.io/badge/License-MIT-informational.svg)](https://github.com/VRLabs/Follower/blob/main/LICENSE) -[![Generic badge](https://img.shields.io/badge/Unity-2019.4.31f1-lightblue.svg)](https://unity3d.com/unity/whats-new/2019.4.31) +[![Generic badge](https://img.shields.io/badge/Quest-Compatible-green?logo=Meta)](https://img.shields.io/badge/Quest-Compatible-green?logo=Meta) +[![Generic badge](https://img.shields.io/badge/Unity-2022.3.22f1-lightblue?logo=Unity)](https://unity.com/releases/editor/whats-new/2022.3.22) [![Generic badge](https://img.shields.io/badge/SDK-AvatarSDK3-lightblue.svg)](https://vrchat.com/home/download) [![Generic badge](https://img.shields.io/discord/706913824607043605?color=%237289da&label=DISCORD&logo=Discord&style=for-the-badge)](https://discord.vrlabs.dev/) @@ -16,7 +17,6 @@ Make something slowly follow you and look at you ### ⬇️ [Download Latest Version](https://github.com/VRLabs/Follower/releases/latest) - ### 📦 [Add to VRChat Creator Companion](https://vrlabs.dev/packages?package=dev.vrlabs.follower) @@ -47,7 +47,8 @@ https://github.com/VRLabs/Follower/assets/76777936/eee1dcbb-0e9d-4f92-bb69-9bcbe ## Performance stats ```c++ -Constraints: 5 +Constraints: 3 +Constraint Depth: 3 Contact Receivers: 1 Contact Senders: 1 ``` @@ -84,4 +85,3 @@ Follower is available as-is under MIT. For more information see [LICENSE](https: [](https://twitter.com/vrlabsdev "VRLabs") - From de0d65d2da123746439e3edf7f08b01f1ddc6328 Mon Sep 17 00:00:00 2001 From: jellejurre Date: Sat, 10 Aug 2024 14:02:30 +0200 Subject: [PATCH 2/6] Automatic VRC Constraint Conversion --- Follower.prefab | 719 +++++++++++++++++++--- Resources/Animations/Follower Active.anim | 62 +- Resources/Animations/Follower Idle.anim | 62 +- Resources/Animations/Follower Init.anim | 62 +- 4 files changed, 733 insertions(+), 172 deletions(-) diff --git a/Follower.prefab b/Follower.prefab index d516b33..018400d 100644 --- a/Follower.prefab +++ b/Follower.prefab @@ -9,9 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1675005943129074272} - - component: {fileID: 7662982361089307345} - component: {fileID: 2417046716499902606} - component: {fileID: 5719607805482665401} + - component: {fileID: 8831345049320777267} m_Layer: 0 m_Name: Follower m_TagString: Untagged @@ -26,43 +26,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669249760399220748} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5147591202370098870} - {fileID: 5349806979329730795} - {fileID: 4330276376573234579} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1773428102 &7662982361089307345 -ParentConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1669249760399220748} - m_Enabled: 1 - m_Weight: 1 - m_TranslationAtRest: {x: 0, y: 0, z: 0} - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_TranslationOffsets: - - {x: 0, y: 0, z: 0} - m_RotationOffsets: - - {x: 0, y: 0, z: 0} - m_AffectTranslationX: 1 - m_AffectTranslationY: 1 - m_AffectTranslationZ: 1 - m_AffectRotationX: 1 - m_AffectRotationY: 1 - m_AffectRotationZ: 1 - m_IsContraintActive: 1 - m_IsLocked: 1 - m_Sources: - - sourceTransform: {fileID: 1720321125886419532, guid: 355dc5cb6e259b34a93ff6c598a91240, - type: 3} - weight: 1 --- !u!114 &2417046716499902606 MonoBehaviour: m_ObjectHideFlags: 0 @@ -109,6 +83,133 @@ MonoBehaviour: receiverType: 0 parameter: Follower/Stop minVelocity: 0.05 +--- !u!114 &8831345049320777267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669249760399220748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 575728033, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Name: + m_EditorClassIdentifier: + IsActive: 1 + GlobalWeight: 1 + TargetTransform: {fileID: 0} + SolveInLocalSpace: 0 + FreezeToWorld: 0 + RebakeOffsetsWhenUnfrozen: 0 + Locked: 1 + Sources: + source0: + SourceTransform: {fileID: 1720321125886419532, guid: 355dc5cb6e259b34a93ff6c598a91240, type: 3} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source1: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source2: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source3: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source4: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source5: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source6: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source7: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source8: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source9: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source10: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source11: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source12: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source13: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source14: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source15: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + totalLength: 1 + overflowList: [] + cachedExecutionGroupIndex: 0 + PositionAtRest: {x: 0, y: 0, z: 0} + AffectsPositionX: 1 + AffectsPositionY: 1 + AffectsPositionZ: 1 + RotationAtRest: {x: 0, y: 0, z: 0} + AffectsRotationX: 1 + AffectsRotationY: 1 + AffectsRotationZ: 1 --- !u!1 &3314792913649324533 GameObject: m_ObjectHideFlags: 0 @@ -132,12 +233,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3314792913649324533} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4330276376573234579} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4330276376573234578 GameObject: @@ -162,13 +264,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4330276376573234578} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3314792913649324538} m_Father: {fileID: 1675005943129074272} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5147591202370098871 GameObject: @@ -179,8 +282,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5147591202370098870} - - component: {fileID: 1569617139350710} - - component: {fileID: 3772533344714541793} + - component: {fileID: 8128217975955554342} + - component: {fileID: 1920395925512977010} m_Layer: 0 m_Name: Container m_TagString: Untagged @@ -195,56 +298,263 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5147591202370098871} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 733502934842423558} m_Father: {fileID: 1675005943129074272} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1818360609 &1569617139350710 -RotationConstraint: +--- !u!114 &8128217975955554342 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5147591202370098871} m_Enabled: 1 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_AffectRotationX: 1 - m_AffectRotationY: 1 - m_AffectRotationZ: 1 - m_IsContraintActive: 1 - m_IsLocked: 1 - m_Sources: - - sourceTransform: {fileID: 5147591202370098870} - weight: 1 - - sourceTransform: {fileID: 5349806979329730795} - weight: 0.1 ---- !u!1818360608 &3772533344714541793 -PositionConstraint: + m_EditorHideFlags: 0 + m_Script: {fileID: 1788371120, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Name: + m_EditorClassIdentifier: + IsActive: 1 + GlobalWeight: 1 + TargetTransform: {fileID: 0} + SolveInLocalSpace: 0 + FreezeToWorld: 0 + RebakeOffsetsWhenUnfrozen: 0 + Locked: 1 + Sources: + source0: + SourceTransform: {fileID: 5147591202370098870} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source1: + SourceTransform: {fileID: 5349806979329730795} + Weight: 0.1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source2: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source3: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source4: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source5: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source6: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source7: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source8: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source9: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source10: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source11: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source12: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source13: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source14: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source15: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + totalLength: 2 + overflowList: [] + cachedExecutionGroupIndex: 2 + RotationAtRest: {x: 0, y: 0, z: 0} + RotationOffset: {x: 0, y: 0, z: 0} + AffectsRotationX: 1 + AffectsRotationY: 1 + AffectsRotationZ: 1 +--- !u!114 &1920395925512977010 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5147591202370098871} m_Enabled: 1 - m_Weight: 1 - m_TranslationAtRest: {x: 0, y: 0, z: 0} - m_TranslationOffset: {x: 0, y: 0, z: 0} - m_AffectTranslationX: 1 - m_AffectTranslationY: 1 - m_AffectTranslationZ: 1 - m_IsContraintActive: 1 - m_IsLocked: 1 - m_Sources: - - sourceTransform: {fileID: 5147591202370098870} - weight: 0 - - sourceTransform: {fileID: 4330276376573234579} - weight: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Name: + m_EditorClassIdentifier: + IsActive: 1 + GlobalWeight: 1 + TargetTransform: {fileID: 0} + SolveInLocalSpace: 0 + FreezeToWorld: 0 + RebakeOffsetsWhenUnfrozen: 0 + Locked: 1 + Sources: + source0: + SourceTransform: {fileID: 5147591202370098870} + Weight: 0 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source1: + SourceTransform: {fileID: 4330276376573234579} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source2: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source3: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source4: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source5: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source6: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source7: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source8: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source9: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source10: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source11: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source12: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source13: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source14: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source15: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + totalLength: 2 + overflowList: [] + cachedExecutionGroupIndex: 1 + PositionAtRest: {x: 0, y: 0, z: 0} + PositionOffset: {x: 0, y: 0, z: 0} + AffectsPositionX: 1 + AffectsPositionY: 1 + AffectsPositionZ: 1 --- !u!1 &5402032507162726271 GameObject: m_ObjectHideFlags: 0 @@ -270,12 +580,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5402032507162726271} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5147591202370098870} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7214168531175340836 MeshFilter: @@ -296,10 +607,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -324,6 +637,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &6105839381786672057 GameObject: m_ObjectHideFlags: 0 @@ -333,8 +647,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5349806979329730795} - - component: {fileID: 3767271862023166392} - - component: {fileID: 6105839381786672058} + - component: {fileID: 8161542971924797865} + - component: {fileID: 8272652998762342227} m_Layer: 0 m_Name: Look Constraint m_TagString: Untagged @@ -349,48 +663,259 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6105839381786672057} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1675005943129074272} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1183024399 &3767271862023166392 -LookAtConstraint: +--- !u!114 &8161542971924797865 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6105839381786672057} m_Enabled: 1 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_Roll: 0 - m_WorldUpObject: {fileID: 0} - m_UseUpObject: 0 - m_IsContraintActive: 1 - m_IsLocked: 1 - m_Sources: - - sourceTransform: {fileID: 3314792913649324538} - weight: 1 ---- !u!1818360608 &6105839381786672058 -PositionConstraint: + m_EditorHideFlags: 0 + m_Script: {fileID: -372946275, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Name: + m_EditorClassIdentifier: + IsActive: 1 + GlobalWeight: 1 + TargetTransform: {fileID: 0} + SolveInLocalSpace: 0 + FreezeToWorld: 0 + RebakeOffsetsWhenUnfrozen: 0 + Locked: 1 + Sources: + source0: + SourceTransform: {fileID: 3314792913649324538} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source1: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source2: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source3: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source4: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source5: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source6: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source7: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source8: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source9: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source10: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source11: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source12: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source13: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source14: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source15: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + totalLength: 1 + overflowList: [] + cachedExecutionGroupIndex: 1 + RotationAtRest: {x: 0, y: 0, z: 0} + RotationOffset: {x: 0, y: 0, z: 0} + WorldUpTransform: {fileID: 0} + Roll: 0 + UseUpTransform: 0 +--- !u!114 &8272652998762342227 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6105839381786672057} m_Enabled: 1 - m_Weight: 1 - m_TranslationAtRest: {x: 0, y: 0, z: 0} - m_TranslationOffset: {x: 0, y: 0, z: 0} - m_AffectTranslationX: 1 - m_AffectTranslationY: 1 - m_AffectTranslationZ: 1 - m_IsContraintActive: 1 - m_IsLocked: 1 - m_Sources: - - sourceTransform: {fileID: 5147591202370098870} - weight: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Name: + m_EditorClassIdentifier: + IsActive: 1 + GlobalWeight: 1 + TargetTransform: {fileID: 0} + SolveInLocalSpace: 0 + FreezeToWorld: 0 + RebakeOffsetsWhenUnfrozen: 0 + Locked: 1 + Sources: + source0: + SourceTransform: {fileID: 5147591202370098870} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source1: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source2: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source3: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source4: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source5: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source6: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source7: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source8: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source9: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source10: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source11: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source12: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source13: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source14: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + source15: + SourceTransform: {fileID: 0} + Weight: 1 + ParentPositionOffset: {x: 0, y: 0, z: 0} + ParentRotationOffset: {x: 0, y: 0, z: 0} + _defaultsApplied: 1 + totalLength: 1 + overflowList: [] + cachedExecutionGroupIndex: 3 + PositionAtRest: {x: 0, y: 0, z: 0} + PositionOffset: {x: 0, y: 0, z: 0} + AffectsPositionX: 1 + AffectsPositionY: 1 + AffectsPositionZ: 1 diff --git a/Resources/Animations/Follower Active.anim b/Resources/Animations/Follower Active.anim index 17243da..404b860 100644 --- a/Resources/Animations/Follower Active.anim +++ b/Resources/Animations/Follower Active.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Follower Active - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -41,11 +42,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[0].weight + attribute: Sources.source0.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} - - curve: + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -69,10 +72,11 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[1].weight + attribute: Sources.source1.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -83,18 +87,22 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 3914876505 - attribute: 12 - script: {fileID: 0} - typeID: 1818360608 - customType: 31 + attribute: 236596898 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3914876505 - attribute: 28 - script: {fileID: 0} - typeID: 1818360608 - customType: 31 + attribute: 3266326076 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -117,7 +125,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -141,11 +150,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[0].weight + attribute: Sources.source0.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} - - curve: + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -169,10 +180,11 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[1].weight + attribute: Sources.source1.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Resources/Animations/Follower Idle.anim b/Resources/Animations/Follower Idle.anim index c3c5667..ad1ece1 100644 --- a/Resources/Animations/Follower Idle.anim +++ b/Resources/Animations/Follower Idle.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Follower Idle - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -41,11 +42,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[0].weight + attribute: Sources.source0.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} - - curve: + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -69,10 +72,11 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[1].weight + attribute: Sources.source1.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -83,18 +87,22 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 3914876505 - attribute: 12 - script: {fileID: 0} - typeID: 1818360608 - customType: 31 + attribute: 236596898 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3914876505 - attribute: 28 - script: {fileID: 0} - typeID: 1818360608 - customType: 31 + attribute: 3266326076 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -117,7 +125,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -141,11 +150,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[0].weight + attribute: Sources.source0.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} - - curve: + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -169,10 +180,11 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[1].weight + attribute: Sources.source1.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Resources/Animations/Follower Init.anim b/Resources/Animations/Follower Init.anim index b495709..6cf3c08 100644 --- a/Resources/Animations/Follower Init.anim +++ b/Resources/Animations/Follower Init.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Follower Init - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -41,11 +42,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[0].weight + attribute: Sources.source0.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} - - curve: + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -69,10 +72,11 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[1].weight + attribute: Sources.source1.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -83,18 +87,22 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 3914876505 - attribute: 12 - script: {fileID: 0} - typeID: 1818360608 - customType: 31 + attribute: 236596898 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3914876505 - attribute: 28 - script: {fileID: 0} - typeID: 1818360608 - customType: 31 + attribute: 3266326076 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -117,7 +125,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -141,11 +150,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[0].weight + attribute: Sources.source0.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} - - curve: + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -169,10 +180,11 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Sources.Array.data[1].weight + attribute: Sources.source1.Weight path: Follower/Container - classID: 1818360608 - script: {fileID: 0} + classID: 114 + script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 From 4b51cf0d2922596d40dee1488f2bd2a967f59030 Mon Sep 17 00:00:00 2001 From: hfcRed Date: Fri, 16 Aug 2024 21:29:59 +0200 Subject: [PATCH 3/6] Simplify follower --- Follower FX.controller | 4 +- Follower.prefab | 681 ++++++++++++----------------------------- 2 files changed, 202 insertions(+), 483 deletions(-) diff --git a/Follower FX.controller b/Follower FX.controller index 7d67c37..1fb9133 100644 --- a/Follower FX.controller +++ b/Follower FX.controller @@ -17,12 +17,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 1 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 0 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1107 &-5642354380112108583 diff --git a/Follower.prefab b/Follower.prefab index 018400d..f54f0ee 100644 --- a/Follower.prefab +++ b/Follower.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1669249760399220748 +--- !u!1 &2714910913695736715 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,91 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1675005943129074272} - - component: {fileID: 2417046716499902606} - - component: {fileID: 5719607805482665401} - - component: {fileID: 8831345049320777267} + - component: {fileID: 280065205474256616} + - component: {fileID: 4735350073014997579} + - component: {fileID: 8734096310088146361} m_Layer: 0 - m_Name: Follower + m_Name: Container m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1675005943129074272 +--- !u!4 &280065205474256616 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1669249760399220748} + m_GameObject: {fileID: 2714910913695736715} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5147591202370098870} - - {fileID: 5349806979329730795} - - {fileID: 4330276376573234579} - m_Father: {fileID: 0} + - {fileID: 3496899983590295805} + m_Father: {fileID: 6826103975315854376} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2417046716499902606 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1669249760399220748} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -802764141, guid: 80f1b8067b0760e4bb45023bc2e9de66, type: 3} - m_Name: - m_EditorClassIdentifier: - rootTransform: {fileID: 4330276376573234579} - shapeType: 0 - radius: 0.1 - height: 2 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - collisionTags: - - Follower/Stop ---- !u!114 &5719607805482665401 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1669249760399220748} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1450912254, guid: 80f1b8067b0760e4bb45023bc2e9de66, type: 3} - m_Name: - m_EditorClassIdentifier: - rootTransform: {fileID: 5147591202370098870} - shapeType: 0 - radius: 0.1 - height: 2 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - collisionTags: - - Follower/Stop - allowSelf: 1 - allowOthers: 0 - localOnly: 0 - receiverType: 0 - parameter: Follower/Stop - minVelocity: 0.05 ---- !u!114 &8831345049320777267 +--- !u!114 &4735350073014997579 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1669249760399220748} + m_GameObject: {fileID: 2714910913695736715} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 575728033, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} m_Name: m_EditorClassIdentifier: IsActive: 1 @@ -104,13 +55,13 @@ MonoBehaviour: Locked: 1 Sources: source0: - SourceTransform: {fileID: 1720321125886419532, guid: 355dc5cb6e259b34a93ff6c598a91240, type: 3} - Weight: 1 + SourceTransform: {fileID: 280065205474256616} + Weight: 0 ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} _defaultsApplied: 1 source1: - SourceTransform: {fileID: 0} + SourceTransform: {fileID: 4522235244423841527} Weight: 1 ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} @@ -199,124 +150,24 @@ MonoBehaviour: ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} _defaultsApplied: 1 - totalLength: 1 + totalLength: 2 overflowList: [] - cachedExecutionGroupIndex: 0 + cachedExecutionGroupIndex: 2 PositionAtRest: {x: 0, y: 0, z: 0} + PositionOffset: {x: 0, y: 0, z: 0} AffectsPositionX: 1 AffectsPositionY: 1 AffectsPositionZ: 1 - RotationAtRest: {x: 0, y: 0, z: 0} - AffectsRotationX: 1 - AffectsRotationY: 1 - AffectsRotationZ: 1 ---- !u!1 &3314792913649324533 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3314792913649324538} - m_Layer: 0 - m_Name: Look Target - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3314792913649324538 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3314792913649324533} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4330276376573234579} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4330276376573234578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4330276376573234579} - m_Layer: 0 - m_Name: Follower Target - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4330276376573234579 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4330276376573234578} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3314792913649324538} - m_Father: {fileID: 1675005943129074272} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5147591202370098871 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5147591202370098870} - - component: {fileID: 8128217975955554342} - - component: {fileID: 1920395925512977010} - m_Layer: 0 - m_Name: Container - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5147591202370098870 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5147591202370098871} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 733502934842423558} - m_Father: {fileID: 1675005943129074272} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8128217975955554342 +--- !u!114 &8734096310088146361 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5147591202370098871} + m_GameObject: {fileID: 2714910913695736715} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1788371120, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Script: {fileID: -372946275, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} m_Name: m_EditorClassIdentifier: IsActive: 1 @@ -328,14 +179,14 @@ MonoBehaviour: Locked: 1 Sources: source0: - SourceTransform: {fileID: 5147591202370098870} - Weight: 1 + SourceTransform: {fileID: 280065205474256616} + Weight: 0.01 ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} _defaultsApplied: 1 source1: - SourceTransform: {fileID: 5349806979329730795} - Weight: 0.1 + SourceTransform: {fileID: 3321965871457255510} + Weight: 1 ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} _defaultsApplied: 1 @@ -425,22 +276,135 @@ MonoBehaviour: _defaultsApplied: 1 totalLength: 2 overflowList: [] - cachedExecutionGroupIndex: 2 - RotationAtRest: {x: 0, y: 0, z: 0} + cachedExecutionGroupIndex: 1 + RotationAtRest: {x: -0, y: 0, z: 0} RotationOffset: {x: 0, y: 0, z: 0} - AffectsRotationX: 1 - AffectsRotationY: 1 - AffectsRotationZ: 1 ---- !u!114 &1920395925512977010 + WorldUpTransform: {fileID: 0} + Roll: 0 + UseUpTransform: 0 +--- !u!1 &5133751909744856908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3321965871457255510} + m_Layer: 0 + m_Name: Look Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3321965871457255510 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5133751909744856908} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4522235244423841527} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5608801531132731946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6826103975315854376} + - component: {fileID: 5046134106383357667} + - component: {fileID: 8413210064015820638} + - component: {fileID: 1971711363488821519} + m_Layer: 0 + m_Name: Follower + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6826103975315854376 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5608801531132731946} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 280065205474256616} + - {fileID: 4522235244423841527} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5046134106383357667 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5147591202370098871} + m_GameObject: {fileID: 5608801531132731946} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} + m_Script: {fileID: -802764141, guid: 80f1b8067b0760e4bb45023bc2e9de66, type: 3} + m_Name: + m_EditorClassIdentifier: + rootTransform: {fileID: 4522235244423841527} + shapeType: 0 + radius: 0.1 + height: 2 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collisionTags: + - Follower/Stop +--- !u!114 &8413210064015820638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5608801531132731946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1450912254, guid: 80f1b8067b0760e4bb45023bc2e9de66, type: 3} + m_Name: + m_EditorClassIdentifier: + rootTransform: {fileID: 280065205474256616} + shapeType: 0 + radius: 0.1 + height: 2 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collisionTags: + - Follower/Stop + allowSelf: 1 + allowOthers: 0 + localOnly: 0 + receiverType: 0 + parameter: Follower/Stop + minVelocity: 0.05 +--- !u!114 &1971711363488821519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5608801531132731946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 575728033, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} m_Name: m_EditorClassIdentifier: IsActive: 1 @@ -452,13 +416,14 @@ MonoBehaviour: Locked: 1 Sources: source0: - SourceTransform: {fileID: 5147591202370098870} - Weight: 0 + SourceTransform: {fileID: 1720321125886419532, guid: 355dc5cb6e259b34a93ff6c598a91240, + type: 3} + Weight: 1 ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} _defaultsApplied: 1 source1: - SourceTransform: {fileID: 4330276376573234579} + SourceTransform: {fileID: 0} Weight: 1 ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} @@ -547,15 +512,18 @@ MonoBehaviour: ParentPositionOffset: {x: 0, y: 0, z: 0} ParentRotationOffset: {x: 0, y: 0, z: 0} _defaultsApplied: 1 - totalLength: 2 + totalLength: 1 overflowList: [] - cachedExecutionGroupIndex: 1 + cachedExecutionGroupIndex: 0 PositionAtRest: {x: 0, y: 0, z: 0} - PositionOffset: {x: 0, y: 0, z: 0} AffectsPositionX: 1 AffectsPositionY: 1 AffectsPositionZ: 1 ---- !u!1 &5402032507162726271 + RotationAtRest: {x: 0, y: 0, z: 0} + AffectsRotationX: 1 + AffectsRotationY: 1 + AffectsRotationZ: 1 +--- !u!1 &6144182265934929070 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -563,46 +531,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 733502934842423558} - - component: {fileID: 7214168531175340836} - - component: {fileID: 1098186029979185321} + - component: {fileID: 4522235244423841527} m_Layer: 0 - m_Name: Cube + m_Name: Follower Target m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &733502934842423558 +--- !u!4 &4522235244423841527 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5402032507162726271} + m_GameObject: {fileID: 6144182265934929070} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3321965871457255510} + m_Father: {fileID: 6826103975315854376} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7433394390155166196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3496899983590295805} + - component: {fileID: 6500032411339808921} + - component: {fileID: 1261976160221543820} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3496899983590295805 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7433394390155166196} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5147591202370098870} + m_Father: {fileID: 280065205474256616} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7214168531175340836 +--- !u!33 &6500032411339808921 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5402032507162726271} + m_GameObject: {fileID: 7433394390155166196} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1098186029979185321 +--- !u!23 &1261976160221543820 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5402032507162726271} + m_GameObject: {fileID: 7433394390155166196} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -638,284 +638,3 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6105839381786672057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5349806979329730795} - - component: {fileID: 8161542971924797865} - - component: {fileID: 8272652998762342227} - m_Layer: 0 - m_Name: Look Constraint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5349806979329730795 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6105839381786672057} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1675005943129074272} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8161542971924797865 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6105839381786672057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -372946275, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} - m_Name: - m_EditorClassIdentifier: - IsActive: 1 - GlobalWeight: 1 - TargetTransform: {fileID: 0} - SolveInLocalSpace: 0 - FreezeToWorld: 0 - RebakeOffsetsWhenUnfrozen: 0 - Locked: 1 - Sources: - source0: - SourceTransform: {fileID: 3314792913649324538} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source1: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source2: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source3: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source4: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source5: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source6: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source7: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source8: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source9: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source10: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source11: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source12: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source13: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source14: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source15: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - totalLength: 1 - overflowList: [] - cachedExecutionGroupIndex: 1 - RotationAtRest: {x: 0, y: 0, z: 0} - RotationOffset: {x: 0, y: 0, z: 0} - WorldUpTransform: {fileID: 0} - Roll: 0 - UseUpTransform: 0 ---- !u!114 &8272652998762342227 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6105839381786672057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1116338486, guid: 58e2f01a24261a14cb82e6d3399e8b16, type: 3} - m_Name: - m_EditorClassIdentifier: - IsActive: 1 - GlobalWeight: 1 - TargetTransform: {fileID: 0} - SolveInLocalSpace: 0 - FreezeToWorld: 0 - RebakeOffsetsWhenUnfrozen: 0 - Locked: 1 - Sources: - source0: - SourceTransform: {fileID: 5147591202370098870} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source1: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source2: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source3: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source4: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source5: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source6: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source7: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source8: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source9: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source10: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source11: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source12: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source13: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source14: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - source15: - SourceTransform: {fileID: 0} - Weight: 1 - ParentPositionOffset: {x: 0, y: 0, z: 0} - ParentRotationOffset: {x: 0, y: 0, z: 0} - _defaultsApplied: 1 - totalLength: 1 - overflowList: [] - cachedExecutionGroupIndex: 3 - PositionAtRest: {x: 0, y: 0, z: 0} - PositionOffset: {x: 0, y: 0, z: 0} - AffectsPositionX: 1 - AffectsPositionY: 1 - AffectsPositionZ: 1 From a8b6cba6ac22f59509fc44ec2c3916a6e63f6c91 Mon Sep 17 00:00:00 2001 From: hfcRed Date: Wed, 21 Aug 2024 18:46:43 +0200 Subject: [PATCH 4/6] Update package json --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bbc37b0..b774c81 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Follower", "version": "1.3.999", "license": "MIT", - "unity": "2019.4", + "unity": "2022.3", "description": "Make something slowly follow you and look at you", "author": { "name": "VRLabs", @@ -26,5 +26,6 @@ "unityPackageDestinationFolderMetas": { "Assets/VRLabs": "652a1ba5b00554143bc9a76307dbc4e8", "Assets/VRLabs/Follower": "f71457bcffdb2c14cb8b10d7f5ad0a93" - } + }, + "questCompatibility": "full" } \ No newline at end of file From 4ffab05586c77a9cbfd13e2236ad5f77bad140ed Mon Sep 17 00:00:00 2001 From: hfcRed Date: Wed, 21 Aug 2024 18:46:48 +0200 Subject: [PATCH 5/6] Update README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index d3fafab..9afc4c1 100755 --- a/README.md +++ b/README.md @@ -38,6 +38,9 @@ https://github.com/VRLabs/Follower/assets/76777936/eee1dcbb-0e9d-4f92-bb69-9bcbe * Expand the prefab hierarchy and find ``Follower Target``. * Move ``Follower Target`` outside of ``Follower`` and place it anywhere in your avatars hierarchy as needed. +> [!NOTE] +> When building for Quest, you will have to remove unsupported components and shaders + ## How to use * Place the objects you want to follow you inside ``Container``. From 8228beb0dc47d339978eaa5927784a5aac9023e0 Mon Sep 17 00:00:00 2001 From: hfcRed Date: Fri, 23 Aug 2024 19:00:50 +0200 Subject: [PATCH 6/6] Update package json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b774c81..bda83d4 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ }, "siteUrl": "https://github.com/VRLabs/Follower", "vpmDependencies": { - "dev.vrlabs.instancer": ">=1.0.2" + "dev.vrlabs.instancer": ">=1.0.2", + "com.vrchat.avatars": "^3.7.0" }, "legacyFolders": { "Assets\\VRLabs\\Follower": "f71457bcffdb2c14cb8b10d7f5ad0a93"