From 5288c391dfe80e7f415f8179b49e8b8c153bebd3 Mon Sep 17 00:00:00 2001 From: Marlena Klein Date: Wed, 28 Jun 2023 15:24:58 -0700 Subject: [PATCH 1/2] Update InputSystem to 1.6.1 --- .../Scenes/HandInteractionExamples.unity | 481 +++++++++++++++--- .../MRTKDevTemplate/Packages/manifest.json | 2 +- .../Packages/packages-lock.json | 8 +- com.microsoft.mrtk.input/package.json | 2 +- .../package.json | 2 +- com.microsoft.mrtk.uxcore/package.json | 2 +- 6 files changed, 412 insertions(+), 85 deletions(-) diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity index 694ac165101..f33380e3b81 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -154,6 +154,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.38268343, z: -0, w: 0.92387956} m_LocalPosition: {x: -1.129, y: -0.1747, z: -0.545} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1710053220} - {fileID: 1998461902} @@ -187,6 +188,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0917, y: -0.0671, z: 0.0163} m_LocalScale: {x: 0.00096758676, y: 0.004151988, z: 0.0017068039} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1376890154} m_RootOrder: 1 @@ -202,6 +204,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -270,6 +273,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.38268343, z: -0, w: 0.92387956} m_LocalPosition: {x: 0.004, y: 1.749, z: -0.004} m_LocalScale: {x: 1.8175921, y: 0.05679976, z: 1.8175921} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146931003} m_RootOrder: 0 @@ -285,6 +289,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -374,6 +379,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} m_RootOrder: 0 @@ -471,12 +477,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 76865738} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 76865738} + m_maskType: 0 --- !u!23 &76865738 MeshRenderer: m_ObjectHideFlags: 0 @@ -488,6 +494,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -674,6 +681,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -730,6 +744,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -950,6 +965,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -970,7 +986,11 @@ MonoBehaviour: hostTransform: {fileID: 79416684} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 1 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -1177,6 +1197,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000100016594} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 6 @@ -1275,12 +1296,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 105991074} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 105991074} + m_maskType: 0 --- !u!23 &105991074 MeshRenderer: m_ObjectHideFlags: 0 @@ -1292,6 +1313,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1348,6 +1370,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.0001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 76865736} - {fileID: 2123527393} @@ -1358,6 +1381,63 @@ Transform: m_Father: {fileID: 1203713056} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &154120067 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1167456911} + m_Modifications: + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6862721871616905633, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_Name + value: MRTK Spatial Mouse Controller + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dc525621b8522034e867ed2799129315, type: 3} --- !u!224 &186579027 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} @@ -1498,6 +1578,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -1530,6 +1617,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -1800,6 +1888,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -1820,7 +1909,11 @@ MonoBehaviour: hostTransform: {fileID: 235624891} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -2086,6 +2179,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.0029} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1583599066} m_RootOrder: 3 @@ -2189,12 +2283,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: -1.8075503} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 243610131} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 243610131} + m_maskType: 0 --- !u!23 &243610131 MeshRenderer: m_ObjectHideFlags: 0 @@ -2206,6 +2300,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2268,6 +2363,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.005910009, y: 0.0011000037, z: -0.0055999756} m_LocalScale: {x: 0.0058, y: 0.0058, z: 0.0058} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 235624891} m_RootOrder: 1 @@ -2283,6 +2379,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2721,6 +2818,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} m_RootOrder: 0 @@ -2829,12 +2927,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 2.1106167, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 429539740} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 429539740} + m_maskType: 0 --- !u!23 &429539740 MeshRenderer: m_ObjectHideFlags: 0 @@ -2846,6 +2944,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3117,6 +3216,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.2566485, z: -0, w: 0.9665049} m_LocalPosition: {x: 0.6704, y: -0.41940457, z: 0.4235} m_LocalScale: {x: 0.0687472, y: 0.068747185, z: 0.06874721} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 3 @@ -3239,6 +3339,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -3319,6 +3426,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -3535,6 +3643,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -3555,7 +3664,11 @@ MonoBehaviour: hostTransform: {fileID: 563549574} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 1 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -3631,6 +3744,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4210,6 +4324,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} m_RootOrder: 0 @@ -4308,12 +4423,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 665858365} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 665858365} + m_maskType: 0 --- !u!23 &665858365 MeshRenderer: m_ObjectHideFlags: 0 @@ -4325,6 +4440,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4449,6 +4565,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -4481,6 +4598,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000100016594} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 5 @@ -4579,12 +4697,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 730431823} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 730431823} + m_maskType: 0 --- !u!23 &730431823 MeshRenderer: m_ObjectHideFlags: 0 @@ -4596,6 +4714,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4723,6 +4842,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: -0.769, y: -0.403, z: -0.264} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 665858363} - {fileID: 1099479634} @@ -4759,6 +4879,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.1458} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 8 @@ -4857,12 +4978,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 828245822} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 828245822} + m_maskType: 0 --- !u!23 &828245822 MeshRenderer: m_ObjectHideFlags: 0 @@ -4874,6 +4995,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5175,6 +5297,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -5207,6 +5336,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -5477,6 +5607,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -5497,7 +5628,11 @@ MonoBehaviour: hostTransform: {fileID: 840468517} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -5715,6 +5850,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.43443066, z: -0, w: 0.90070534} m_LocalPosition: {x: 0.6121, y: -0.49410006, z: 0.4318} m_LocalScale: {x: 0.06874721, y: 0.068747185, z: 0.06874721} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 2 @@ -5741,6 +5877,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -5821,6 +5964,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -6037,6 +6181,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -6057,7 +6202,11 @@ MonoBehaviour: hostTransform: {fileID: 888851582} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 1 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -6229,6 +6378,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6369,6 +6519,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.685} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2131597836} m_RootOrder: 2 @@ -6474,12 +6625,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 8.773954, w: -5.0294595} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 956891495} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 956891495} + m_maskType: 0 --- !u!23 &956891495 MeshRenderer: m_ObjectHideFlags: 0 @@ -6491,6 +6642,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6548,6 +6700,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -6580,6 +6739,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -6700,6 +6860,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -6720,7 +6881,11 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -7174,6 +7339,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0528, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1364289930} - {fileID: 2096650620} @@ -7212,6 +7378,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} m_RootOrder: 1 @@ -7307,12 +7474,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1099479636} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1099479636} + m_maskType: 0 --- !u!23 &1099479636 MeshRenderer: m_ObjectHideFlags: 0 @@ -7324,6 +7491,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7396,6 +7564,11 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1.0000004, z: 0.100000024} m_Center: {x: 0.00000017881393, y: -4.440892e-17, z: 0.050000012} +--- !u!4 &1167456911 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + m_PrefabInstance: {fileID: 1530487694} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1170466718 PrefabInstance: m_ObjectHideFlags: 0 @@ -7574,6 +7747,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.187} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} m_RootOrder: 4 @@ -7678,12 +7852,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1180287158} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1180287158} + m_maskType: 0 --- !u!23 &1180287158 MeshRenderer: m_ObjectHideFlags: 0 @@ -7695,6 +7869,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7751,6 +7926,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.061, y: 1.769, z: 1.104} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1170466719} - {fileID: 1852224431} @@ -7798,6 +7974,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.583, y: -0.043, z: 0.726} m_LocalScale: {x: 1.4077, y: 1.4077, z: 1.4077} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1823018503} m_Father: {fileID: 2131597836} @@ -7934,6 +8111,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8014,6 +8198,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8182,6 +8367,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -8202,7 +8388,11 @@ MonoBehaviour: hostTransform: {fileID: 1232423737} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -8302,17 +8492,17 @@ MonoBehaviour: - key: PassiveHover value: effects: - - id: 0 + - rid: 0 isVariable: 0 - key: ActiveHover value: effects: - - id: 1 + - rid: 1 isVariable: 0 - key: Select value: effects: - - id: 2 + - rid: 2 isVariable: 1 - key: Toggle value: @@ -8321,8 +8511,9 @@ MonoBehaviour: interactable: {fileID: 1232423740} animator: {fileID: 1232423744} references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -8331,7 +8522,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - 00000001: + - rid: 1 type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -8340,7 +8531,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - 00000002: + - rid: 2 type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -8351,7 +8542,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1232423744 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8364,10 +8555,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1232423745 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8509,6 +8702,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8541,6 +8741,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8672,6 +8873,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -9209,6 +9411,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -9265,6 +9474,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -9385,6 +9595,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -9405,7 +9616,11 @@ MonoBehaviour: hostTransform: {fileID: 1294530692} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -9657,6 +9872,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.2566485, z: -0, w: 0.9665049} m_LocalPosition: {x: 0.679, y: -0.4941, z: 0.48800004} m_LocalScale: {x: 0.0687472, y: 0.068747185, z: 0.06874721} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 0 @@ -9683,6 +9899,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -9763,6 +9986,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -9979,6 +10203,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -9999,7 +10224,11 @@ MonoBehaviour: hostTransform: {fileID: 1357057978} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 1 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -10171,6 +10400,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -10311,6 +10541,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.06980002} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} m_RootOrder: 2 @@ -10407,12 +10638,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1357577560} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1357577560} + m_maskType: 0 --- !u!23 &1357577560 MeshRenderer: m_ObjectHideFlags: 0 @@ -10424,6 +10655,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -10490,6 +10722,7 @@ Transform: m_LocalRotation: {x: -0, y: 0.03280899, z: -0, w: 0.9994617} m_LocalPosition: {x: 0.725, y: -0.49410006, z: 0.413} m_LocalScale: {x: 0.06874719, y: 0.068747185, z: 0.0687472} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 1 @@ -10516,6 +10749,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -10596,6 +10836,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -10812,6 +11053,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -10832,7 +11074,11 @@ MonoBehaviour: hostTransform: {fileID: 1357838089} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 1 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -11004,6 +11250,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -11356,6 +11603,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0349, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1002036032} - {fileID: 1996988710} @@ -11402,6 +11650,11 @@ MonoBehaviour: m_EditorClassIdentifier: outlineMaterial: {fileID: 2100000, guid: cf3f7a021c11ff3448af91b319a16682, type: 2} outlineWidth: 0.004 + autoAssignRenderQueue: 1 + useStencilOutline: 0 + stencilWriteMaterial: {fileID: 0} + outlineOffset: 0 + stencilReference: 1 --- !u!1001 &1530487694 PrefabInstance: m_ObjectHideFlags: 0 @@ -11488,6 +11741,7 @@ Transform: m_LocalRotation: {x: 0.28939572, y: -0, z: -0, w: 0.9572095} m_LocalPosition: {x: -0.01144, y: -0.37624, z: 0.09883} m_LocalScale: {x: 0.23897779, y: 0.0437293, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 735511181} m_RootOrder: 5 @@ -11517,6 +11771,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -11765,7 +12020,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6593650948243348711, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.000000029802322 objectReference: {fileID: 0} - target: {fileID: 6593650948243348711, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} propertyPath: m_LocalPosition.z @@ -11860,6 +12115,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: 0.077, y: 0, z: -0.072} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1376890154} - {fileID: 2131597836} @@ -11952,6 +12208,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12008,6 +12271,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12128,6 +12392,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -12148,7 +12413,11 @@ MonoBehaviour: hostTransform: {fileID: 1710053220} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - useForcesForNearManipulation: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -12194,6 +12463,7 @@ Transform: 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: 186579027} m_Father: {fileID: 5174432} @@ -12340,6 +12610,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12420,6 +12697,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12588,6 +12866,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -12608,7 +12887,11 @@ MonoBehaviour: hostTransform: {fileID: 1923515645} allowedManipulations: -1 allowedInteractionTypes: -1 - useForcesForNearManipulation: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -12804,17 +13087,17 @@ MonoBehaviour: - key: PassiveHover value: effects: - - id: 0 + - rid: 0 isVariable: 0 - key: ActiveHover value: effects: - - id: 1 + - rid: 1 isVariable: 0 - key: Select value: effects: - - id: 2 + - rid: 2 isVariable: 1 - key: Toggle value: @@ -12823,8 +13106,9 @@ MonoBehaviour: interactable: {fileID: 1724991366} animator: {fileID: 1724991371} references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -12833,7 +13117,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - 00000001: + - rid: 1 type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -12842,7 +13126,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - 00000002: + - rid: 2 type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -12853,7 +13137,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1724991371 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -12866,10 +13150,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1727403010 GameObject: m_ObjectHideFlags: 0 @@ -12896,6 +13182,7 @@ Transform: 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: 1357057978} - {fileID: 1357838089} @@ -13057,6 +13344,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} m_RootOrder: 1 @@ -13152,12 +13440,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 3.7221162} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1802540762} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1802540762} + m_maskType: 0 --- !u!23 &1802540762 MeshRenderer: m_ObjectHideFlags: 0 @@ -13169,6 +13457,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -13228,6 +13517,7 @@ Transform: m_LocalRotation: {x: -0.0009970319, y: 0.84594023, z: 0.00047610726, w: 0.5332766} m_LocalPosition: {x: 0, y: -0.0749, z: -0.028} m_LocalScale: {x: 0.7956348, y: 0.79563415, z: 0.7956348} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1232423737} m_RootOrder: 0 @@ -13243,6 +13533,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -13295,6 +13586,11 @@ MonoBehaviour: m_EditorClassIdentifier: outlineMaterial: {fileID: 2100000, guid: a721d00e26938d84e84fdb745fd9a77f, type: 2} outlineWidth: 0.004 + autoAssignRenderQueue: 1 + useStencilOutline: 0 + stencilWriteMaterial: {fileID: 0} + outlineOffset: 0 + stencilReference: 1 --- !u!1001 &1824793667 PrefabInstance: m_ObjectHideFlags: 0 @@ -13881,6 +14177,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.19388044, y: 0.43222737, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 429539738} - {fileID: 1802540760} @@ -14002,6 +14299,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.056, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2040252717} - {fileID: 840468517} @@ -14155,6 +14453,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -14187,6 +14492,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -14344,6 +14650,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -14765,6 +15072,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.011} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5174432} m_RootOrder: 1 @@ -14863,12 +15171,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: -1.8075503} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1998461904} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1998461904} + m_maskType: 0 --- !u!23 &1998461904 MeshRenderer: m_ObjectHideFlags: 0 @@ -14880,6 +15188,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -14937,6 +15246,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.005910009, y: 0.0011000037, z: -0.0055999756} m_LocalScale: {x: 0.0058, y: 0.0058, z: 0.0058} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 840468517} m_RootOrder: 1 @@ -14952,6 +15262,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15020,6 +15331,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 0 @@ -15122,12 +15434,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 7.0536785, w: -1.8075503} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2040252719} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2040252719} + m_maskType: 0 --- !u!23 &2040252719 MeshRenderer: m_ObjectHideFlags: 0 @@ -15139,6 +15451,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15197,6 +15510,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.1458} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 7 @@ -15295,12 +15609,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2059242326} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2059242326} + m_maskType: 0 --- !u!23 &2059242326 MeshRenderer: m_ObjectHideFlags: 0 @@ -15312,6 +15626,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15693,6 +16008,7 @@ Transform: m_LocalRotation: {x: 0.21668836, y: -0.8997533, z: -0.21801639, w: 0.30977273} m_LocalPosition: {x: 0.4087, y: -0.3559, z: -0.0792} m_LocalScale: {x: 1.1901672, y: 1.1901666, z: 1.190167} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} m_RootOrder: 1 @@ -15708,6 +16024,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15864,6 +16181,13 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -15896,6 +16220,7 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -16053,6 +16378,7 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 + k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -16276,6 +16602,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: -0.042, z: 0.202} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1232423737} - {fileID: 1923515645} diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index 1dacb18c26f..3b77294bb25 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json +++ b/UnityProjects/MRTKDevTemplate/Packages/manifest.json @@ -25,7 +25,7 @@ "com.unity.ide.rider": "3.0.18", "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.5.1", + "com.unity.inputsystem": "1.6.1", "com.unity.mobile.android-logcat": "1.3.2", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.project-auditor": "https://github.com/Unity-Technologies/ProjectAuditor.git", diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json index c615b30c39e..f34c1c5d211 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -109,7 +109,7 @@ "dependencies": { "com.microsoft.mrtk.core": "3.0.0", "com.microsoft.mrtk.graphicstools.unity": "0.5.12", - "com.unity.inputsystem": "1.5.1", + "com.unity.inputsystem": "1.6.1", "com.unity.xr.arfoundation": "5.0.5", "com.unity.xr.interaction.toolkit": "2.3.0", "com.unity.xr.core-utils": "2.1.0" @@ -122,7 +122,7 @@ "dependencies": { "com.microsoft.mrtk.core": "3.0.0", "com.microsoft.mrtk.uxcore": "3.0.0", - "com.unity.inputsystem": "1.5.1", + "com.unity.inputsystem": "1.6.1", "com.unity.xr.interaction.toolkit": "2.3.0" } }, @@ -177,7 +177,7 @@ "dependencies": { "com.microsoft.mrtk.core": "3.0.0", "com.microsoft.mrtk.graphicstools.unity": "0.5.12", - "com.unity.inputsystem": "1.5.1", + "com.unity.inputsystem": "1.6.1", "com.unity.textmeshpro": "3.0.6", "com.unity.xr.interaction.toolkit": "2.3.0" } @@ -246,7 +246,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.5.1", + "version": "1.6.1", "depth": 0, "source": "registry", "dependencies": { diff --git a/com.microsoft.mrtk.input/package.json b/com.microsoft.mrtk.input/package.json index c7015cd052d..4c25b8bb70b 100644 --- a/com.microsoft.mrtk.input/package.json +++ b/com.microsoft.mrtk.input/package.json @@ -17,7 +17,7 @@ "dependencies": { "com.microsoft.mrtk.core": "3.0.0", "com.microsoft.mrtk.graphicstools.unity": "0.5.12", - "com.unity.inputsystem": "1.5.1", + "com.unity.inputsystem": "1.6.1", "com.unity.xr.arfoundation": "5.0.5", "com.unity.xr.interaction.toolkit": "2.3.0", "com.unity.xr.core-utils": "2.1.0" diff --git a/com.microsoft.mrtk.spatialmanipulation/package.json b/com.microsoft.mrtk.spatialmanipulation/package.json index 20f64fb93d5..d00bd8cb6a6 100644 --- a/com.microsoft.mrtk.spatialmanipulation/package.json +++ b/com.microsoft.mrtk.spatialmanipulation/package.json @@ -17,7 +17,7 @@ "dependencies": { "com.microsoft.mrtk.core": "3.0.0", "com.microsoft.mrtk.uxcore": "3.0.0", - "com.unity.inputsystem": "1.5.1", + "com.unity.inputsystem": "1.6.1", "com.unity.xr.interaction.toolkit": "2.3.0" }, "msftOptionalPackages": { diff --git a/com.microsoft.mrtk.uxcore/package.json b/com.microsoft.mrtk.uxcore/package.json index 09aacb09446..7949ef25689 100644 --- a/com.microsoft.mrtk.uxcore/package.json +++ b/com.microsoft.mrtk.uxcore/package.json @@ -17,7 +17,7 @@ "dependencies": { "com.microsoft.mrtk.core": "3.0.0", "com.microsoft.mrtk.graphicstools.unity": "0.5.12", - "com.unity.inputsystem": "1.5.1", + "com.unity.inputsystem": "1.6.1", "com.unity.textmeshpro": "3.0.6", "com.unity.xr.interaction.toolkit": "2.3.0" }, From d928f8f10a36632f5bc93a8749a53ec85cae247e Mon Sep 17 00:00:00 2001 From: Marlena Klein Date: Wed, 28 Jun 2023 15:42:37 -0700 Subject: [PATCH 2/2] Revert scene --- .../Scenes/HandInteractionExamples.unity | 481 +++--------------- 1 file changed, 77 insertions(+), 404 deletions(-) diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity index f33380e3b81..694ac165101 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -154,7 +154,6 @@ Transform: m_LocalRotation: {x: -0, y: -0.38268343, z: -0, w: 0.92387956} m_LocalPosition: {x: -1.129, y: -0.1747, z: -0.545} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1710053220} - {fileID: 1998461902} @@ -188,7 +187,6 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0917, y: -0.0671, z: 0.0163} m_LocalScale: {x: 0.00096758676, y: 0.004151988, z: 0.0017068039} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1376890154} m_RootOrder: 1 @@ -204,7 +202,6 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -273,7 +270,6 @@ Transform: m_LocalRotation: {x: -0, y: -0.38268343, z: -0, w: 0.92387956} m_LocalPosition: {x: 0.004, y: 1.749, z: -0.004} m_LocalScale: {x: 1.8175921, y: 0.05679976, z: 1.8175921} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146931003} m_RootOrder: 0 @@ -289,7 +285,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -379,7 +374,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} m_RootOrder: 0 @@ -477,12 +471,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 76865738} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &76865738 MeshRenderer: m_ObjectHideFlags: 0 @@ -494,7 +488,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -681,13 +674,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -744,7 +730,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -965,7 +950,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -986,11 +970,7 @@ MonoBehaviour: hostTransform: {fileID: 79416684} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 1 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -1197,7 +1177,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000100016594} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 6 @@ -1296,12 +1275,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 105991074} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &105991074 MeshRenderer: m_ObjectHideFlags: 0 @@ -1313,7 +1292,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1370,7 +1348,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.0001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 76865736} - {fileID: 2123527393} @@ -1381,63 +1358,6 @@ Transform: m_Father: {fileID: 1203713056} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &154120067 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1167456911} - m_Modifications: - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6862721871616905633, guid: dc525621b8522034e867ed2799129315, type: 3} - propertyPath: m_Name - value: MRTK Spatial Mouse Controller - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dc525621b8522034e867ed2799129315, type: 3} --- !u!224 &186579027 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} @@ -1578,13 +1498,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -1617,7 +1530,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -1888,7 +1800,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -1909,11 +1820,7 @@ MonoBehaviour: hostTransform: {fileID: 235624891} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 0 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -2179,7 +2086,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.0029} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1583599066} m_RootOrder: 3 @@ -2283,12 +2189,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: -1.8075503} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 243610131} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &243610131 MeshRenderer: m_ObjectHideFlags: 0 @@ -2300,7 +2206,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2363,7 +2268,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.005910009, y: 0.0011000037, z: -0.0055999756} m_LocalScale: {x: 0.0058, y: 0.0058, z: 0.0058} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 235624891} m_RootOrder: 1 @@ -2379,7 +2283,6 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2818,7 +2721,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} m_RootOrder: 0 @@ -2927,12 +2829,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 2.1106167, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 429539740} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &429539740 MeshRenderer: m_ObjectHideFlags: 0 @@ -2944,7 +2846,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3216,7 +3117,6 @@ Transform: m_LocalRotation: {x: -0, y: -0.2566485, z: -0, w: 0.9665049} m_LocalPosition: {x: 0.6704, y: -0.41940457, z: 0.4235} m_LocalScale: {x: 0.0687472, y: 0.068747185, z: 0.06874721} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 3 @@ -3339,13 +3239,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -3426,7 +3319,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -3643,7 +3535,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -3664,11 +3555,7 @@ MonoBehaviour: hostTransform: {fileID: 563549574} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 1 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -3744,7 +3631,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4324,7 +4210,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} m_RootOrder: 0 @@ -4423,12 +4308,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 665858365} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &665858365 MeshRenderer: m_ObjectHideFlags: 0 @@ -4440,7 +4325,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4565,7 +4449,6 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -4598,7 +4481,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000100016594} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 5 @@ -4697,12 +4579,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 730431823} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &730431823 MeshRenderer: m_ObjectHideFlags: 0 @@ -4714,7 +4596,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4842,7 +4723,6 @@ Transform: m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: -0.769, y: -0.403, z: -0.264} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 665858363} - {fileID: 1099479634} @@ -4879,7 +4759,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.1458} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 8 @@ -4978,12 +4857,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 828245822} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &828245822 MeshRenderer: m_ObjectHideFlags: 0 @@ -4995,7 +4874,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5297,13 +5175,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -5336,7 +5207,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -5607,7 +5477,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -5628,11 +5497,7 @@ MonoBehaviour: hostTransform: {fileID: 840468517} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 0 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -5850,7 +5715,6 @@ Transform: m_LocalRotation: {x: -0, y: -0.43443066, z: -0, w: 0.90070534} m_LocalPosition: {x: 0.6121, y: -0.49410006, z: 0.4318} m_LocalScale: {x: 0.06874721, y: 0.068747185, z: 0.06874721} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 2 @@ -5877,13 +5741,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -5964,7 +5821,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -6181,7 +6037,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -6202,11 +6057,7 @@ MonoBehaviour: hostTransform: {fileID: 888851582} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 1 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -6378,7 +6229,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6519,7 +6369,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.685} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2131597836} m_RootOrder: 2 @@ -6625,12 +6474,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 8.773954, w: -5.0294595} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 956891495} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &956891495 MeshRenderer: m_ObjectHideFlags: 0 @@ -6642,7 +6491,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6700,13 +6548,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -6739,7 +6580,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -6860,7 +6700,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -6881,11 +6720,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 0 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -7339,7 +7174,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0528, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1364289930} - {fileID: 2096650620} @@ -7378,7 +7212,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} m_RootOrder: 1 @@ -7474,12 +7307,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 1099479636} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &1099479636 MeshRenderer: m_ObjectHideFlags: 0 @@ -7491,7 +7324,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7564,11 +7396,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1.0000004, z: 0.100000024} m_Center: {x: 0.00000017881393, y: -4.440892e-17, z: 0.050000012} ---- !u!4 &1167456911 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1170466718 PrefabInstance: m_ObjectHideFlags: 0 @@ -7747,7 +7574,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.187} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} m_RootOrder: 4 @@ -7852,12 +7678,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 1180287158} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &1180287158 MeshRenderer: m_ObjectHideFlags: 0 @@ -7869,7 +7695,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7926,7 +7751,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.061, y: 1.769, z: 1.104} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1170466719} - {fileID: 1852224431} @@ -7974,7 +7798,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.583, y: -0.043, z: 0.726} m_LocalScale: {x: 1.4077, y: 1.4077, z: 1.4077} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1823018503} m_Father: {fileID: 2131597836} @@ -8111,13 +7934,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8198,7 +8014,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8367,7 +8182,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -8388,11 +8202,7 @@ MonoBehaviour: hostTransform: {fileID: 1232423737} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 0 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -8492,17 +8302,17 @@ MonoBehaviour: - key: PassiveHover value: effects: - - rid: 0 + - id: 0 isVariable: 0 - key: ActiveHover value: effects: - - rid: 1 + - id: 1 isVariable: 0 - key: Select value: effects: - - rid: 2 + - id: 2 isVariable: 1 - key: Toggle value: @@ -8511,9 +8321,8 @@ MonoBehaviour: interactable: {fileID: 1232423740} animator: {fileID: 1232423744} references: - version: 2 - RefIds: - - rid: 0 + version: 1 + 00000000: type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -8522,7 +8331,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - - rid: 1 + 00000001: type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -8531,7 +8340,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - - rid: 2 + 00000002: type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -8542,7 +8351,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1232423744 Animator: - serializedVersion: 5 + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8555,12 +8364,10 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &1232423745 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8702,13 +8509,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8741,7 +8541,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -8873,7 +8672,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -9411,13 +9209,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -9474,7 +9265,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -9595,7 +9385,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -9616,11 +9405,7 @@ MonoBehaviour: hostTransform: {fileID: 1294530692} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 0 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -9872,7 +9657,6 @@ Transform: m_LocalRotation: {x: -0, y: -0.2566485, z: -0, w: 0.9665049} m_LocalPosition: {x: 0.679, y: -0.4941, z: 0.48800004} m_LocalScale: {x: 0.0687472, y: 0.068747185, z: 0.06874721} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 0 @@ -9899,13 +9683,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -9986,7 +9763,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -10203,7 +9979,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -10224,11 +9999,7 @@ MonoBehaviour: hostTransform: {fileID: 1357057978} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 1 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -10400,7 +10171,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -10541,7 +10311,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.06980002} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} m_RootOrder: 2 @@ -10638,12 +10407,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 0.732635} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 1357577560} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &1357577560 MeshRenderer: m_ObjectHideFlags: 0 @@ -10655,7 +10424,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -10722,7 +10490,6 @@ Transform: m_LocalRotation: {x: -0, y: 0.03280899, z: -0, w: 0.9994617} m_LocalPosition: {x: 0.725, y: -0.49410006, z: 0.413} m_LocalScale: {x: 0.06874719, y: 0.068747185, z: 0.0687472} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} m_RootOrder: 1 @@ -10749,13 +10516,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -10836,7 +10596,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -11053,7 +10812,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -11074,11 +10832,7 @@ MonoBehaviour: hostTransform: {fileID: 1357838089} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 1 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -11250,7 +11004,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -11603,7 +11356,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0349, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1002036032} - {fileID: 1996988710} @@ -11650,11 +11402,6 @@ MonoBehaviour: m_EditorClassIdentifier: outlineMaterial: {fileID: 2100000, guid: cf3f7a021c11ff3448af91b319a16682, type: 2} outlineWidth: 0.004 - autoAssignRenderQueue: 1 - useStencilOutline: 0 - stencilWriteMaterial: {fileID: 0} - outlineOffset: 0 - stencilReference: 1 --- !u!1001 &1530487694 PrefabInstance: m_ObjectHideFlags: 0 @@ -11741,7 +11488,6 @@ Transform: m_LocalRotation: {x: 0.28939572, y: -0, z: -0, w: 0.9572095} m_LocalPosition: {x: -0.01144, y: -0.37624, z: 0.09883} m_LocalScale: {x: 0.23897779, y: 0.0437293, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 735511181} m_RootOrder: 5 @@ -11771,7 +11517,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -12020,7 +11765,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6593650948243348711, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} propertyPath: m_LocalPosition.y - value: -0.000000029802322 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6593650948243348711, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} propertyPath: m_LocalPosition.z @@ -12115,7 +11860,6 @@ Transform: m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: 0.077, y: 0, z: -0.072} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1376890154} - {fileID: 2131597836} @@ -12208,13 +11952,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12271,7 +12008,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12392,7 +12128,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -12413,11 +12148,7 @@ MonoBehaviour: hostTransform: {fileID: 1710053220} allowedManipulations: 7 allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 0 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -12463,7 +12194,6 @@ Transform: 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: 186579027} m_Father: {fileID: 5174432} @@ -12610,13 +12340,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 1 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12697,7 +12420,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -12866,7 +12588,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -12887,11 +12608,7 @@ MonoBehaviour: hostTransform: {fileID: 1923515645} allowedManipulations: -1 allowedInteractionTypes: -1 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 + useForcesForNearManipulation: 0 rotationAnchorNear: 1 rotationAnchorFar: 1 releaseBehavior: 3 @@ -13087,17 +12804,17 @@ MonoBehaviour: - key: PassiveHover value: effects: - - rid: 0 + - id: 0 isVariable: 0 - key: ActiveHover value: effects: - - rid: 1 + - id: 1 isVariable: 0 - key: Select value: effects: - - rid: 2 + - id: 2 isVariable: 1 - key: Toggle value: @@ -13106,9 +12823,8 @@ MonoBehaviour: interactable: {fileID: 1724991366} animator: {fileID: 1724991371} references: - version: 2 - RefIds: - - rid: 0 + version: 1 + 00000000: type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -13117,7 +12833,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - - rid: 1 + 00000001: type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -13126,7 +12842,7 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 - - rid: 2 + 00000002: type: {class: AnimationEffect, ns: Microsoft.MixedReality.Toolkit.UX, asm: Microsoft.MixedReality.Toolkit.UXCore} data: name: Animation @@ -13137,7 +12853,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1724991371 Animator: - serializedVersion: 5 + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -13150,12 +12866,10 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1727403010 GameObject: m_ObjectHideFlags: 0 @@ -13182,7 +12896,6 @@ Transform: 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: 1357057978} - {fileID: 1357838089} @@ -13344,7 +13057,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} m_RootOrder: 1 @@ -13440,12 +13152,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: 3.7221162} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 1802540762} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &1802540762 MeshRenderer: m_ObjectHideFlags: 0 @@ -13457,7 +13169,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -13517,7 +13228,6 @@ Transform: m_LocalRotation: {x: -0.0009970319, y: 0.84594023, z: 0.00047610726, w: 0.5332766} m_LocalPosition: {x: 0, y: -0.0749, z: -0.028} m_LocalScale: {x: 0.7956348, y: 0.79563415, z: 0.7956348} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1232423737} m_RootOrder: 0 @@ -13533,7 +13243,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -13586,11 +13295,6 @@ MonoBehaviour: m_EditorClassIdentifier: outlineMaterial: {fileID: 2100000, guid: a721d00e26938d84e84fdb745fd9a77f, type: 2} outlineWidth: 0.004 - autoAssignRenderQueue: 1 - useStencilOutline: 0 - stencilWriteMaterial: {fileID: 0} - outlineOffset: 0 - stencilReference: 1 --- !u!1001 &1824793667 PrefabInstance: m_ObjectHideFlags: 0 @@ -14177,7 +13881,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.19388044, y: 0.43222737, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 429539738} - {fileID: 1802540760} @@ -14299,7 +14002,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.056, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2040252717} - {fileID: 840468517} @@ -14453,13 +14155,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -14492,7 +14187,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -14650,7 +14344,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -15072,7 +14765,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.011} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5174432} m_RootOrder: 1 @@ -15171,12 +14863,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.5926552, w: -1.8075503} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 1998461904} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &1998461904 MeshRenderer: m_ObjectHideFlags: 0 @@ -15188,7 +14880,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15246,7 +14937,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.005910009, y: 0.0011000037, z: -0.0055999756} m_LocalScale: {x: 0.0058, y: 0.0058, z: 0.0058} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 840468517} m_RootOrder: 1 @@ -15262,7 +14952,6 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15331,7 +15020,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 0 @@ -15434,12 +15122,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 7.0536785, w: -1.8075503} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 2040252719} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &2040252719 MeshRenderer: m_ObjectHideFlags: 0 @@ -15451,7 +15139,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15510,7 +15197,6 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.1458} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} m_RootOrder: 7 @@ -15609,12 +15295,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 m_hasFontAssetChanged: 0 m_renderer: {fileID: 2059242326} m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!23 &2059242326 MeshRenderer: m_ObjectHideFlags: 0 @@ -15626,7 +15312,6 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -16008,7 +15693,6 @@ Transform: m_LocalRotation: {x: 0.21668836, y: -0.8997533, z: -0.21801639, w: 0.30977273} m_LocalPosition: {x: 0.4087, y: -0.3559, z: -0.0792} m_LocalScale: {x: 1.1901672, y: 1.1901666, z: 1.190167} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} m_RootOrder: 1 @@ -16024,7 +15708,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -16181,13 +15864,6 @@ MonoBehaviour: m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 m_FirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -16220,7 +15896,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -16378,7 +16053,6 @@ MonoBehaviour: allowSelectByVoice: 1 speechRecognitionKeyword: select k__BackingField: 1 - k__BackingField: 0 k__BackingField: active: 0 onEntered: @@ -16602,7 +16276,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: -0.042, z: 0.202} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1232423737} - {fileID: 1923515645}