From dc0cc4cd32d001380f099390fb2d85f74c1f5ee4 Mon Sep 17 00:00:00 2001 From: joonasp <56842740+Joonasp1@users.noreply.github.com> Date: Wed, 9 Mar 2022 21:37:11 +0200 Subject: [PATCH] Grabbing object and initial flying locomotion --- .../JoonasP.meta} | 6 +- .../Project Files/Scripts/JoonasP/FlyWand.cs | 34 + .../Scripts/JoonasP/FlyWand.cs.meta | 11 + Assets/Scenes/JoonasP/SampleScene.unity | 1363 +++++++++-------- 4 files changed, 779 insertions(+), 635 deletions(-) rename Assets/Project Files/{Shaders/Fantasy Adventure Environment/URP/_UniversalRenderPipeline.unitypackage.meta => Scripts/JoonasP.meta} (53%) create mode 100644 Assets/Project Files/Scripts/JoonasP/FlyWand.cs create mode 100644 Assets/Project Files/Scripts/JoonasP/FlyWand.cs.meta diff --git a/Assets/Project Files/Shaders/Fantasy Adventure Environment/URP/_UniversalRenderPipeline.unitypackage.meta b/Assets/Project Files/Scripts/JoonasP.meta similarity index 53% rename from Assets/Project Files/Shaders/Fantasy Adventure Environment/URP/_UniversalRenderPipeline.unitypackage.meta rename to Assets/Project Files/Scripts/JoonasP.meta index 01577030..9b409ede 100644 --- a/Assets/Project Files/Shaders/Fantasy Adventure Environment/URP/_UniversalRenderPipeline.unitypackage.meta +++ b/Assets/Project Files/Scripts/JoonasP.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 7c884420a5dfbaa4db9afe42d366b843 -timeCreated: 1575711200 -licenseType: Store +guid: 60ce99a0af04f934190ce18ee4f567b6 +folderAsset: yes DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Project Files/Scripts/JoonasP/FlyWand.cs b/Assets/Project Files/Scripts/JoonasP/FlyWand.cs new file mode 100644 index 00000000..991f42a1 --- /dev/null +++ b/Assets/Project Files/Scripts/JoonasP/FlyWand.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FlyWand : MonoBehaviour +{ + private GameObject player; + private bool isFlying; + + private void Awake() + { + player = GameObject.FindGameObjectWithTag("Player"); + isFlying = false; + } + + + private void Update() + { + if (isFlying) + { + player.transform.position += transform.up * 0.5f; + } + } + + public void EnableFly() + { + isFlying = true; + } + + public void DisableFly() + { + isFlying = false; + } +} diff --git a/Assets/Project Files/Scripts/JoonasP/FlyWand.cs.meta b/Assets/Project Files/Scripts/JoonasP/FlyWand.cs.meta new file mode 100644 index 00000000..b1a1b241 --- /dev/null +++ b/Assets/Project Files/Scripts/JoonasP/FlyWand.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee8103568a01d804d89cb1fc1dff91eb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/JoonasP/SampleScene.unity b/Assets/Scenes/JoonasP/SampleScene.unity index d62078f5..80c58420 100644 --- a/Assets/Scenes/JoonasP/SampleScene.unity +++ b/Assets/Scenes/JoonasP/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.59937435, g: 0.5997503, b: 0.5994879, a: 1} + m_IndirectSpecularColor: {r: 0.59937525, g: 0.5997512, b: 0.59948856, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -125,6 +125,18 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &14792960 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + m_PrefabInstance: {fileID: 973685166} + m_PrefabAsset: {fileID: 0} +--- !u!4 &407110722 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + m_PrefabInstance: {fileID: 715119311} + m_PrefabAsset: {fileID: 0} --- !u!1 &492689958 GameObject: m_ObjectHideFlags: 0 @@ -135,9 +147,8 @@ GameObject: m_Component: - component: {fileID: 492689959} - component: {fileID: 492689963} - - component: {fileID: 492689962} - - component: {fileID: 492689961} - - component: {fileID: 492689960} + - component: {fileID: 492689964} + - component: {fileID: 492689965} m_Layer: 0 m_Name: LeftHand Controller m_TagString: Untagged @@ -153,321 +164,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 492689958} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.1145, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 14792960} m_Father: {fileID: 508810528} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &492689960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492689958} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LineWidth: 0.02 - m_OverrideInteractorLineLength: 1 - m_LineLength: 10 - m_WidthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ValidColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_InvalidColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0, b: 0, a: 1} - key1: {r: 1, g: 0, b: 0, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_SmoothMovement: 0 - m_FollowTightness: 10 - m_SnapThresholdDistance: 10 - m_Reticle: {fileID: 0} - m_StopLineAtFirstRaycastHit: 1 ---- !u!120 &492689961 -LineRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492689958} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 1} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.005 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 1, a: 1} - key1: {r: 0, g: 0, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 4 - numCapVertices: 4 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &492689962 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492689958} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6803edce0201f574f923fd9d10e5b30a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1989791150} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 4294967295 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectActionTrigger: 0 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 0 - m_PlayAudioClipOnSelectEntered: 0 - m_AudioClipForOnSelectEntered: {fileID: 0} - m_PlayAudioClipOnSelectExited: 0 - m_AudioClipForOnSelectExited: {fileID: 0} - m_PlayAudioClipOnSelectCanceled: 0 - m_AudioClipForOnSelectCanceled: {fileID: 0} - m_PlayAudioClipOnHoverEntered: 0 - m_AudioClipForOnHoverEntered: {fileID: 0} - m_PlayAudioClipOnHoverExited: 0 - m_AudioClipForOnHoverExited: {fileID: 0} - m_PlayAudioClipOnHoverCanceled: 0 - m_AudioClipForOnHoverCanceled: {fileID: 0} - m_PlayHapticsOnSelectEntered: 0 - m_HapticSelectEnterIntensity: 0 - m_HapticSelectEnterDuration: 0 - m_PlayHapticsOnSelectExited: 0 - m_HapticSelectExitIntensity: 0 - m_HapticSelectExitDuration: 0 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 0 - m_HapticHoverEnterIntensity: 0 - m_HapticHoverEnterDuration: 0 - m_PlayHapticsOnHoverExited: 0 - m_HapticHoverExitIntensity: 0 - m_HapticHoverExitDuration: 0 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 - m_LineType: 0 - m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 30 - m_RayOriginTransform: {fileID: 0} - m_ReferenceFrame: {fileID: 0} - m_Velocity: 16 - m_Acceleration: 9.8 - m_AdditionalGroundHeight: 0.1 - m_AdditionalFlightTime: 0.5 - m_EndPointDistance: 30 - m_EndPointHeight: -10 - m_ControlPointDistance: 10 - m_ControlPointHeight: 5 - m_SampleFrequency: 20 - m_HitDetectionType: 0 - m_SphereCastRadius: 0.1 - m_RaycastMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RaycastTriggerInteraction: 1 - m_HitClosestOnly: 0 - m_HoverToSelect: 0 - m_HoverTimeToSelect: 0.5 - m_EnableUIInteraction: 1 - m_AllowAnchorControl: 1 - m_UseForceGrab: 1 - m_RotateSpeed: 180 - m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} --- !u!114 &492689963 MonoBehaviour: m_ObjectHideFlags: 0 @@ -485,7 +189,7 @@ MonoBehaviour: m_EnableInputActions: 1 m_ModelPrefab: {fileID: 0} m_ModelParent: {fileID: 0} - m_Model: {fileID: 0} + m_Model: {fileID: 14792960} m_AnimateModel: 0 m_ModelSelectTransition: m_ModelDeSelectTransition: @@ -646,6 +350,97 @@ MonoBehaviour: m_Reference: {fileID: 7779212132400271959, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_ButtonPressPoint: 0.5 +--- !u!114 &492689964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492689958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4253f32900bcc4d499d675566142ded0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 1989791150} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectActionTrigger: 0 + m_HideControllerOnSelect: 0 + m_AllowHoveredActivate: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 +--- !u!135 &492689965 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492689958} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.05 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &508810527 GameObject: m_ObjectHideFlags: 0 @@ -778,6 +573,103 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &687459017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 687459021} + - component: {fileID: 687459020} + - component: {fileID: 687459019} + - component: {fileID: 687459018} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &687459018 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687459017} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &687459019 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687459017} + m_Enabled: 1 + 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: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &687459020 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687459017} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &687459021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687459017} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.061769, y: 0.41, z: -9.87} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -872,6 +764,134 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &715119311 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2088577709} + m_Modifications: + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4283425761326543017, guid: 1f4d373a613d0466fbd8849470265852, + type: 3} + propertyPath: m_Name + value: XRControllerRight + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f4d373a613d0466fbd8849470265852, type: 3} +--- !u!1001 &973685166 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 492689959} + m_Modifications: + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8270855663187062767, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8758423527188247893, guid: 5b158b94c373d4b4f9e98cdb92789343, + type: 3} + propertyPath: m_Name + value: XRControllerLeft + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5b158b94c373d4b4f9e98cdb92789343, type: 3} --- !u!1 &1578543174 GameObject: m_ObjectHideFlags: 0 @@ -882,9 +902,11 @@ GameObject: m_Component: - component: {fileID: 1578543176} - component: {fileID: 1578543175} + - component: {fileID: 1578543177} + - component: {fileID: 1578543178} m_Layer: 0 m_Name: XR Origin - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -914,7 +936,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578543174} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5, y: 26.339746, z: -12} + m_LocalPosition: {x: -5, y: 0, z: -12} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -922,6 +944,90 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1578543177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578543174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0bf296fc962d7184ab14ad1841598d5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_System: {fileID: 1651537454} + m_MoveSpeed: 1 + m_EnableStrafe: 1 + m_UseGravity: 1 + m_GravityApplicationMode: 0 + m_ForwardSource: {fileID: 0} + m_LeftHandMoveAction: + m_UseReference: 1 + m_Action: + m_Name: Left Hand Move + m_Type: 0 + m_ExpectedControlType: + m_Id: 75f1b245-c357-48c8-9acb-8967bec9dda2 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 6972639530819350904, guid: c348712bda248c246b8c49b3db54643f, + type: 3} + m_RightHandMoveAction: + m_UseReference: 1 + m_Action: + m_Name: Right Hand Move + m_Type: 0 + m_ExpectedControlType: + m_Id: 6bf6c732-e011-46b1-acc5-b649a4ec5f10 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -8198699208435500284, guid: c348712bda248c246b8c49b3db54643f, + type: 3} +--- !u!114 &1578543178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578543174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 919e39492806b334982b6b84c90dd927, type: 3} + m_Name: + m_EditorClassIdentifier: + m_System: {fileID: 0} + m_TurnSpeed: 60 + m_LeftHandTurnAction: + m_UseReference: 1 + m_Action: + m_Name: Left Hand Turn + m_Type: 0 + m_ExpectedControlType: + m_Id: b9ac2485-f305-451c-9106-d1d25cc235dc + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 1010738217276881514, guid: c348712bda248c246b8c49b3db54643f, + type: 3} + m_RightHandTurnAction: + m_UseReference: 1 + m_Action: + m_Name: Right Hand Turn + m_Type: 0 + m_ExpectedControlType: + m_Id: 93119ec4-ae3b-41c0-8fb4-7ff4c5e6f732 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -6493913391331992944, guid: c348712bda248c246b8c49b3db54643f, + type: 3} --- !u!1 &1651537451 GameObject: m_ObjectHideFlags: 0 @@ -932,8 +1038,6 @@ GameObject: m_Component: - component: {fileID: 1651537455} - component: {fileID: 1651537454} - - component: {fileID: 1651537453} - - component: {fileID: 1651537452} m_Layer: 0 m_Name: Locomotion System m_TagString: Untagged @@ -941,62 +1045,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1651537452 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1651537451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2213c36610e3b1c4bbf886810ed9db12, type: 3} - m_Name: - m_EditorClassIdentifier: - m_System: {fileID: 1651537454} - m_TurnAmount: 45 - m_DebounceTime: 0.5 - m_EnableTurnLeftRight: 1 - m_EnableTurnAround: 1 - m_LeftHandSnapTurnAction: - m_UseReference: 1 - m_Action: - m_Name: Left Hand Snap Turn - m_Type: 0 - m_ExpectedControlType: - m_Id: a1d07c24-ca50-422a-a23f-685d9fabf63b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 1010738217276881514, guid: c348712bda248c246b8c49b3db54643f, - type: 3} - m_RightHandSnapTurnAction: - m_UseReference: 1 - m_Action: - m_Name: Right Hand Snap Turn - m_Type: 0 - m_ExpectedControlType: - m_Id: a7b54797-6974-4f75-81d0-42b9c15ef1e0 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6493913391331992944, guid: c348712bda248c246b8c49b3db54643f, - type: 3} ---- !u!114 &1651537453 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1651537451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01f69dc1cb084aa42b2f2f8cd87bc770, type: 3} - m_Name: - m_EditorClassIdentifier: - m_System: {fileID: 1651537454} --- !u!114 &1651537454 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1243,7 +1291,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2088577708 +--- !u!1 &2010956415 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1251,156 +1299,55 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2088577709} - - component: {fileID: 2088577713} - - component: {fileID: 2088577712} - - component: {fileID: 2088577711} - - component: {fileID: 2088577710} + - component: {fileID: 2010956420} + - component: {fileID: 2010956419} + - component: {fileID: 2010956418} + - component: {fileID: 2010956417} + - component: {fileID: 2010956421} + - component: {fileID: 2010956422} + - component: {fileID: 2010956423} m_Layer: 0 - m_Name: RightHand Controller + m_Name: Capsule m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2088577709 -Transform: +--- !u!136 &2010956417 +CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2088577708} - 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: 508810528} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2088577710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2088577708} + m_GameObject: {fileID: 2010956415} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LineWidth: 0.02 - m_OverrideInteractorLineLength: 1 - m_LineLength: 10 - m_WidthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ValidColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_InvalidColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0, b: 0, a: 1} - key1: {r: 1, g: 0, b: 0, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_SmoothMovement: 0 - m_FollowTightness: 10 - m_SnapThresholdDistance: 10 - m_Reticle: {fileID: 0} - m_StopLineAtFirstRaycastHit: 1 ---- !u!120 &2088577711 -LineRenderer: + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2010956418 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2088577708} + m_GameObject: {fileID: 2010956415} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1420,98 +1367,128 @@ LineRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 1} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.005 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 1, a: 1} - key1: {r: 0, g: 0, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 4 - numCapVertices: 4 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &2088577712 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2010956419 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010956415} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2010956420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010956415} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -5.061769, y: 1.379, z: -9.87} + m_LocalScale: {x: 0.1, y: 0.2, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!54 &2010956421 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010956415} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &2010956422 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2088577708} + m_GameObject: {fileID: 2010956415} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6803edce0201f574f923fd9d10e5b30a, type: 3} + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 1989791150} + m_Colliders: [] m_InteractionLayerMask: serializedVersion: 2 m_Bits: 4294967295 m_InteractionLayers: - m_Bits: 4294967295 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_StartingSelectedInteractable: {fileID: 0} + m_Bits: 1 + m_SelectMode: 0 + m_CustomReticle: {fileID: 0} + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] m_HoverEntered: m_PersistentCalls: m_Calls: [] m_HoverExited: m_PersistentCalls: m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] m_SelectEntered: m_PersistentCalls: m_Calls: [] m_SelectExited: m_PersistentCalls: m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2010956423} + m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp + m_MethodName: EnableFly + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_Deactivated: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2010956423} + m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp + m_MethodName: DisableFly + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] m_OnHoverEntered: m_PersistentCalls: m_Calls: [] @@ -1524,68 +1501,99 @@ MonoBehaviour: m_OnSelectExited: m_PersistentCalls: m_Calls: [] - m_SelectActionTrigger: 0 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 0 - m_PlayAudioClipOnSelectEntered: 0 - m_AudioClipForOnSelectEntered: {fileID: 0} - m_PlayAudioClipOnSelectExited: 0 - m_AudioClipForOnSelectExited: {fileID: 0} - m_PlayAudioClipOnSelectCanceled: 0 - m_AudioClipForOnSelectCanceled: {fileID: 0} - m_PlayAudioClipOnHoverEntered: 0 - m_AudioClipForOnHoverEntered: {fileID: 0} - m_PlayAudioClipOnHoverExited: 0 - m_AudioClipForOnHoverExited: {fileID: 0} - m_PlayAudioClipOnHoverCanceled: 0 - m_AudioClipForOnHoverCanceled: {fileID: 0} - m_PlayHapticsOnSelectEntered: 0 - m_HapticSelectEnterIntensity: 0 - m_HapticSelectEnterDuration: 0 - m_PlayHapticsOnSelectExited: 0 - m_HapticSelectExitIntensity: 0 - m_HapticSelectExitDuration: 0 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 0 - m_HapticHoverEnterIntensity: 0 - m_HapticHoverEnterDuration: 0 - m_PlayHapticsOnHoverExited: 0 - m_HapticHoverExitIntensity: 0 - m_HapticHoverExitDuration: 0 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 - m_LineType: 0 - m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 30 - m_RayOriginTransform: {fileID: 0} - m_ReferenceFrame: {fileID: 0} - m_Velocity: 16 - m_Acceleration: 9.8 - m_AdditionalGroundHeight: 0.1 - m_AdditionalFlightTime: 0.5 - m_EndPointDistance: 30 - m_EndPointHeight: -10 - m_ControlPointDistance: 10 - m_ControlPointHeight: 5 - m_SampleFrequency: 20 - m_HitDetectionType: 0 - m_SphereCastRadius: 0.1 - m_RaycastMask: + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + m_AttachTransform: {fileID: 0} + m_AttachEaseInTime: 0.15 + m_MovementType: 2 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 0 + m_SmoothPositionAmount: 5 + m_TightenPosition: 0.5 + m_TrackRotation: 1 + m_SmoothRotation: 0 + m_SmoothRotationAmount: 5 + m_TightenRotation: 0.5 + m_ThrowOnDetach: 1 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: serializedVersion: 2 - m_Bits: 4294967295 - m_RaycastTriggerInteraction: 1 - m_HitClosestOnly: 0 - m_HoverToSelect: 0 - m_HoverTimeToSelect: 0.5 - m_EnableUIInteraction: 1 - m_AllowAnchorControl: 1 - m_UseForceGrab: 1 - m_RotateSpeed: 180 - m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_AttachPointCompatibilityMode: 0 +--- !u!114 &2010956423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010956415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2088577708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2088577709} + - component: {fileID: 2088577713} + - component: {fileID: 2088577714} + - component: {fileID: 2088577715} + m_Layer: 0 + m_Name: RightHand Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2088577709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088577708} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.1175, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 407110722} + m_Father: {fileID: 508810528} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2088577713 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1603,7 +1611,7 @@ MonoBehaviour: m_EnableInputActions: 1 m_ModelPrefab: {fileID: 0} m_ModelParent: {fileID: 0} - m_Model: {fileID: 0} + m_Model: {fileID: 407110722} m_AnimateModel: 0 m_ModelSelectTransition: m_ModelDeSelectTransition: @@ -1764,3 +1772,94 @@ MonoBehaviour: m_Reference: {fileID: 875253871413052681, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_ButtonPressPoint: 0.5 +--- !u!114 &2088577714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088577708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4253f32900bcc4d499d675566142ded0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 1989791150} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectActionTrigger: 0 + m_HideControllerOnSelect: 0 + m_AllowHoveredActivate: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 +--- !u!135 &2088577715 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088577708} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.05 + m_Center: {x: 0, y: 0, z: 0}